1:修改房间设置,
2:修改个人主页头像框展示 3:修改礼物墙数据错乱不让展示的问题 4:修改房间设置里面的活动,变成趣味活动,当有参数的并且是打开的情况下,是展示的
@@ -21,6 +21,7 @@ import android.widget.TextView;
|
|||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.constraintlayout.widget.ConstraintLayout;
|
import androidx.constraintlayout.widget.ConstraintLayout;
|
||||||
|
|
||||||
|
import com.blankj.utilcode.util.LogUtils;
|
||||||
import com.chad.library.adapter.base.BaseQuickAdapter;
|
import com.chad.library.adapter.base.BaseQuickAdapter;
|
||||||
import com.chad.library.adapter.base.BaseViewHolder;
|
import com.chad.library.adapter.base.BaseViewHolder;
|
||||||
import com.hjq.toast.ToastUtils;
|
import com.hjq.toast.ToastUtils;
|
||||||
@@ -78,8 +79,6 @@ public class GiftRoomAdapter extends BaseQuickAdapter<RoonGiftModel, BaseViewHol
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void convert(@NonNull BaseViewHolder helper, RoonGiftModel giftModel) {
|
protected void convert(@NonNull BaseViewHolder helper, RoonGiftModel giftModel) {
|
||||||
|
|
||||||
|
|
||||||
helper.getView(R.id.cl_gift).setOnClickListener(v -> {
|
helper.getView(R.id.cl_gift).setOnClickListener(v -> {
|
||||||
// RoonGiftModel clickedModel = (RoonGiftModel) v.getTag();
|
// RoonGiftModel clickedModel = (RoonGiftModel) v.getTag();
|
||||||
if (giftModel.getIs_lock() == 0) {
|
if (giftModel.getIs_lock() == 0) {
|
||||||
@@ -121,13 +120,7 @@ public class GiftRoomAdapter extends BaseQuickAdapter<RoonGiftModel, BaseViewHol
|
|||||||
ImageUtils.loadImageView(giftModel.getBase_image(), helper.getView(R.id.iv_gift_pic));
|
ImageUtils.loadImageView(giftModel.getBase_image(), helper.getView(R.id.iv_gift_pic));
|
||||||
//设置选中后的样式
|
//设置选中后的样式
|
||||||
|
|
||||||
if (giftModel.isChecked()) {//被选中
|
|
||||||
helper.getView(R.id.cl_iv_down_on).setBackgroundResource(R.mipmap.room_gift_bjx);
|
|
||||||
helper.setVisible(R.id.iv_down_on,false);
|
|
||||||
} else {
|
|
||||||
helper.getView(R.id.cl_iv_down_on).setBackgroundResource(0);
|
|
||||||
helper.setVisible(R.id.iv_down_on,false);
|
|
||||||
}
|
|
||||||
if (giftModel.getGift_bag() == 10) {
|
if (giftModel.getGift_bag() == 10) {
|
||||||
helper.setText(R.id.tv_gift_name,"");
|
helper.setText(R.id.tv_gift_name,"");
|
||||||
helper.getView(R.id.cl_gift).setBackgroundResource(R.mipmap.gift_tkzj);
|
helper.getView(R.id.cl_gift).setBackgroundResource(R.mipmap.gift_tkzj);
|
||||||
@@ -140,6 +133,18 @@ public class GiftRoomAdapter extends BaseQuickAdapter<RoonGiftModel, BaseViewHol
|
|||||||
helper.setText(R.id.tv_gift_name,"");
|
helper.setText(R.id.tv_gift_name,"");
|
||||||
helper.getView(R.id.cl_gift).setBackgroundResource(R.mipmap.gift_sjzd);
|
helper.getView(R.id.cl_gift).setBackgroundResource(R.mipmap.gift_sjzd);
|
||||||
helper.getView(R.id.tv_gift_name).setBackgroundResource(R.mipmap.gift_name_skzd);
|
helper.getView(R.id.tv_gift_name).setBackgroundResource(R.mipmap.gift_name_skzd);
|
||||||
|
}else {
|
||||||
|
helper.setText(R.id.tv_gift_name,giftModel.getGift_name());
|
||||||
|
helper.getView(R.id.tv_gift_name).setBackgroundResource(0);
|
||||||
|
helper.getView(R.id.cl_gift).setBackgroundResource(R.mipmap.gift_bj);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (giftModel.isChecked()) {//被选中
|
||||||
|
helper.getView(R.id.cl_iv_down_on).setBackgroundResource(R.mipmap.room_gift_bjx);
|
||||||
|
helper.setVisible(R.id.iv_down_on,false);
|
||||||
|
} else {
|
||||||
|
helper.getView(R.id.cl_iv_down_on).setBackgroundResource(0);
|
||||||
|
helper.setVisible(R.id.iv_down_on,false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.voice.lib_base.base.dialog
|
package com.xscm.moduleutil.base
|
||||||
|
|
||||||
import android.app.Dialog
|
import android.app.Dialog
|
||||||
import android.content.DialogInterface
|
import android.content.DialogInterface
|
||||||
|
|||||||
@@ -1311,7 +1311,7 @@ public class RetrofitClient {
|
|||||||
if (response.code() == 200) {
|
if (response.code() == 200) {
|
||||||
BaseModel<String> baseModel = response.body();
|
BaseModel<String> baseModel = response.body();
|
||||||
if (baseModel.getCode() == 1) {
|
if (baseModel.getCode() == 1) {
|
||||||
ToastUtils.showLong(baseModel.getMsg());
|
ToastUtils.showLong("热度卡使用成功");
|
||||||
observer.onNext(baseModel.getMsg());
|
observer.onNext(baseModel.getMsg());
|
||||||
} else if (baseModel.getCode() == 301) {
|
} else if (baseModel.getCode() == 301) {
|
||||||
setCode301(baseModel.getMsg());
|
setCode301(baseModel.getMsg());
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
app:layout_constraintWidth_percent="0.95"
|
app:layout_constraintWidth_percent="0.8"
|
||||||
app:riv_oval="true" />
|
app:riv_oval="true" />
|
||||||
|
|
||||||
|
|
||||||
@@ -32,7 +32,8 @@
|
|||||||
android:scaleType="fitXY"
|
android:scaleType="fitXY"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintDimensionRatio="1:1"
|
app:layout_constraintDimensionRatio="1:1"
|
||||||
app:layout_constraintWidth_percent="1"
|
app:layout_constraintWidth_percent="0.9"
|
||||||
|
app:layout_constraintHeight_percent="0.9"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 3.6 KiB |
@@ -242,6 +242,10 @@
|
|||||||
android:name=".service.CancelNoticeService"
|
android:name=".service.CancelNoticeService"
|
||||||
android:enabled="true"
|
android:enabled="true"
|
||||||
android:exported="true" />
|
android:exported="true" />
|
||||||
|
|
||||||
|
<meta-data
|
||||||
|
android:name="preloaded_fonts"
|
||||||
|
android:resource="@array/preloaded_fonts" />
|
||||||
</application>
|
</application>
|
||||||
|
|
||||||
</manifest>
|
</manifest>
|
||||||
@@ -79,7 +79,7 @@ public class PlaceholderGiftFragment extends Fragment {
|
|||||||
public void onUserClick(GiftUserWallBean.GiftWallBean emotion) {
|
public void onUserClick(GiftUserWallBean.GiftWallBean emotion) {
|
||||||
// 处理用户点击事件
|
// 处理用户点击事件
|
||||||
GiftWallListDialog giftWallListDialog = new GiftWallListDialog(ActivityUtils.getTopActivity());
|
GiftWallListDialog giftWallListDialog = new GiftWallListDialog(ActivityUtils.getTopActivity());
|
||||||
giftWallListDialog.show(userId,emotion.getGift_id()+"", emotion.getGift_name(),emotion.getTop_users_count());
|
giftWallListDialog.show(userId,emotion.getGift_id()+"", emotion.getGift_name(),emotion.getTop_users()!=null ?emotion.getTop_users().size():0);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -97,9 +97,9 @@ public class GiftWallAdapter extends BaseAdapter {
|
|||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
if (item.is_liang()) {
|
if (item.is_liang()) {
|
||||||
if (mOnUserClickListener != null) {
|
if (mOnUserClickListener != null) {
|
||||||
if (item.getTop_users() != null && item.getTop_users().size() > 0) {
|
// if (item.getTop_users() != null && item.getTop_users().size() > 0) {
|
||||||
mOnUserClickListener.onUserClick(item);
|
mOnUserClickListener.onUserClick(item);
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ class BoxRankListAdapter2 :
|
|||||||
override fun convert(helper: BaseViewHolder, item: MonsterUserLogBean) {
|
override fun convert(helper: BaseViewHolder, item: MonsterUserLogBean) {
|
||||||
|
|
||||||
helper.setText(R.id.tv_time,TimeUtils.millis2String(item.add_time.toLong() * 1000))
|
helper.setText(R.id.tv_time,TimeUtils.millis2String(item.add_time.toLong() * 1000))
|
||||||
.setText(R.id.tv_type_name,"炼仙传说:" + item.type_name)
|
.setText(R.id.tv_type_name,"马迎新春:" + item.type_name)
|
||||||
.setText(R.id.tv_result,"第${item.mid}期 ${item.nick_name}中了${item.gift_name}(${item.gift_price})*${item.num}")
|
.setText(R.id.tv_result,"第${item.mid}期 ${item.nick_name}中了${item.gift_name}(${item.gift_price})*${item.num}")
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -18,15 +18,15 @@ class BoxRecordListAdapter2 :
|
|||||||
when(item.is_join){
|
when(item.is_join){
|
||||||
// 1已中奖,2未中奖,3未参与
|
// 1已中奖,2未中奖,3未参与
|
||||||
1->{
|
1->{
|
||||||
helper.setText(R.id.tv_result,"第${it.id}期 炼仙传说 ${it.type_name} 获得 ${item.gift_name}(${item.gift_price})*${item.num}")
|
helper.setText(R.id.tv_result,"第${it.id}期 马迎新春 ${it.type_name} 获得 ${item.gift_name}(${item.gift_price})*${item.num}")
|
||||||
.setText(R.id.tv_join,"已中奖")
|
.setText(R.id.tv_join,"已中奖")
|
||||||
}
|
}
|
||||||
2->{
|
2->{
|
||||||
helper.setText(R.id.tv_result,"第${it.id}期 炼仙传说 ${it.type_name}")
|
helper.setText(R.id.tv_result,"第${it.id}期 马迎新春 ${it.type_name}")
|
||||||
.setText(R.id.tv_join,"未中奖")
|
.setText(R.id.tv_join,"未中奖")
|
||||||
}
|
}
|
||||||
3->{
|
3->{
|
||||||
helper.setText(R.id.tv_result,"第${it.id}期 炼仙传说 ${it.type_name}")
|
helper.setText(R.id.tv_result,"第${it.id}期 马迎新春 ${it.type_name}")
|
||||||
.setText(R.id.tv_join,"未参与")
|
.setText(R.id.tv_join,"未参与")
|
||||||
}
|
}
|
||||||
else -> {
|
else -> {
|
||||||
|
|||||||
@@ -529,7 +529,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
|
|||||||
dialog.setTvStartTime(roomInfoResp.getRoom_info().getStart_time());
|
dialog.setTvStartTime(roomInfoResp.getRoom_info().getStart_time());
|
||||||
dialog.show(getChildFragmentManager(), "DoubleTimePicker");
|
dialog.show(getChildFragmentManager(), "DoubleTimePicker");
|
||||||
} else if (bean.getType() == QXRoomSettingTypeRoomBusinessLegend) {
|
} else if (bean.getType() == QXRoomSettingTypeRoomBusinessLegend) {
|
||||||
new BoxMainDialog2((RoomActivity) getSelfActivity()).show(getChildFragmentManager(), "炼仙传说");
|
new BoxMainDialog2((RoomActivity) getSelfActivity()).show(getChildFragmentManager(), "马迎新春");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -735,7 +735,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
|
|||||||
@Override
|
@Override
|
||||||
public void blindBoxStatus(List<BlindBoxStatus> blindBoxStatus) {
|
public void blindBoxStatus(List<BlindBoxStatus> blindBoxStatus) {
|
||||||
if (blindBoxStatus != null && !blindBoxStatus.isEmpty()) {
|
if (blindBoxStatus != null && !blindBoxStatus.isEmpty()) {
|
||||||
RoomSettingBean moreParent = new RoomSettingBean("活动", null, null, null, -1, read, isSelected, true, false);
|
RoomSettingBean moreParent = null;
|
||||||
List<RoomSettingBean> moreChildren = new ArrayList<>();
|
List<RoomSettingBean> moreChildren = new ArrayList<>();
|
||||||
for (int i = 0; i < blindBoxStatus.size(); i++) {
|
for (int i = 0; i < blindBoxStatus.size(); i++) {
|
||||||
int giftBagId = blindBoxStatus.get(i).getGift_bag_id();
|
int giftBagId = blindBoxStatus.get(i).getGift_bag_id();
|
||||||
@@ -748,9 +748,9 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
|
|||||||
if (status == 1) {
|
if (status == 1) {
|
||||||
moreChildren.add(new RoomSettingBean("时空之巅", "time_space", null, null, QXRoomSettingTypeRoomTimeSpace, read, isSelected, true, false));
|
moreChildren.add(new RoomSettingBean("时空之巅", "time_space", null, null, QXRoomSettingTypeRoomTimeSpace, read, isSelected, true, false));
|
||||||
}
|
}
|
||||||
}else if (giftBagId == 60) {
|
} else if (giftBagId == 60) {
|
||||||
if (status == 1) {
|
if (status == 1) {
|
||||||
moreChildren.add(new RoomSettingBean("炼仙传说", "legend", null, null, QXRoomSettingTypeRoomBusinessLegend, read, isSelected, true, redSound));
|
moreChildren.add(new RoomSettingBean("马迎新春", "legend", null, null, QXRoomSettingTypeRoomBusinessLegend, read, isSelected, true, redSound));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// else {
|
// else {
|
||||||
@@ -759,8 +759,12 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
|
|||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
moreParent.setChildren(moreChildren);
|
if (!moreChildren.isEmpty()) {
|
||||||
filteredList.add(moreParent);
|
moreParent = new RoomSettingBean("趣味活动", null, null, null, -1, read, isSelected, true, false);
|
||||||
|
moreParent.setChildren(moreChildren);
|
||||||
|
filteredList.add(moreParent);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
adapter.notifyDataSetChanged();
|
adapter.notifyDataSetChanged();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,12 +3,14 @@ package com.yuyin.module_live.ui.baoxiang5
|
|||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.widget.TextView
|
import android.widget.TextView
|
||||||
|
import androidx.core.widget.addTextChangedListener
|
||||||
|
import androidx.core.widget.doAfterTextChanged
|
||||||
import androidx.lifecycle.ViewModelProviders
|
import androidx.lifecycle.ViewModelProviders
|
||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import com.chad.library.adapter.base.BaseQuickAdapter
|
import com.chad.library.adapter.base.BaseQuickAdapter
|
||||||
import com.chad.library.adapter.base.BaseViewHolder
|
import com.chad.library.adapter.base.BaseViewHolder
|
||||||
import com.google.android.gms.common.api.ApiException
|
import com.google.android.gms.common.api.ApiException
|
||||||
import com.voice.lib_base.base.dialog.BaseFragmentDialog
|
import com.xscm.moduleutil.base.BaseFragmentDialog
|
||||||
import com.xscm.modulemain.R
|
import com.xscm.modulemain.R
|
||||||
import com.xscm.modulemain.activity.room.activity.RoomActivity
|
import com.xscm.modulemain.activity.room.activity.RoomActivity
|
||||||
import com.xscm.modulemain.activity.room.presenter.RoomViewModel
|
import com.xscm.modulemain.activity.room.presenter.RoomViewModel
|
||||||
@@ -79,6 +81,15 @@ class BoxInputMultipleDialog() :
|
|||||||
mBinding.btnCancel.setOnClickListener {
|
mBinding.btnCancel.setOnClickListener {
|
||||||
dismiss()
|
dismiss()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
mBinding.number.doAfterTextChanged { editable ->
|
||||||
|
// 文本改变后的操作
|
||||||
|
val text = editable?.toString() ?: ""
|
||||||
|
mBinding.tvIntegral.text = "金币${(text.toInt() * monsterInfoBean.open_monster_price.toInt())}/$money"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setupRecyclerView() {
|
private fun setupRecyclerView() {
|
||||||
@@ -98,24 +109,25 @@ class BoxInputMultipleDialog() :
|
|||||||
|
|
||||||
private fun updateIntegralText() {
|
private fun updateIntegralText() {
|
||||||
val num = mBinding.number.text.toString().ifEmpty { "0" }.toIntOrNull() ?: 0
|
val num = mBinding.number.text.toString().ifEmpty { "0" }.toIntOrNull() ?: 0
|
||||||
viewModel.monsterInfo.value?.let {
|
// viewModel.monsterInfo.value?.let {
|
||||||
mBinding.tvIntegral.text = "金币${(num * it.open_monster_price.toInt())}/$money"
|
// mBinding.tvIntegral.text = "金币${(num * it.open_monster_price.toInt())}/$money"
|
||||||
}
|
// }
|
||||||
|
mBinding.tvIntegral.text = "金币${(num * monsterInfoBean.open_monster_price.toInt())}/$money"
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun updateTextViews(info: MonsterInfoBean) {
|
private fun updateTextViews(info: MonsterInfoBean) {
|
||||||
mBinding.tvTextNum.text = "${info.open_monster_price}金币/次"
|
mBinding.tvTextNum.text = "${info.open_monster_price}金币/次"
|
||||||
mBinding.tvIntegral.text = "金币${(10 * info.open_monster_price.toInt())}/$money"
|
mBinding.tvIntegral.text = "金币${(info.open_monster_price.toInt())}/$money"
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setupMultipleImages() {
|
private fun setupMultipleImages() {
|
||||||
when (multiple) {
|
when (multiple) {
|
||||||
"1" -> setMultipleImage("玉狮子", R.mipmap.anim_wealth1)
|
"1" -> setMultipleImage(name, R.mipmap.anim_wealth1)
|
||||||
"2" -> setMultipleImage("乌骓马", R.mipmap.anim_wealth2)
|
"2" -> setMultipleImage(name, R.mipmap.anim_wealth2)
|
||||||
"3" -> setMultipleImage("追风驹", R.mipmap.anim_wealth3)
|
"3" -> setMultipleImage(name, R.mipmap.anim_wealth3)
|
||||||
"4" -> setMultipleImage("乌云驹", R.mipmap.anim_wealth4)
|
"4" -> setMultipleImage(name, R.mipmap.anim_wealth4)
|
||||||
"5" -> setMultipleImage("黄彪马", R.mipmap.anim_wealth5)
|
"5" -> setMultipleImage(name, R.mipmap.anim_wealth5)
|
||||||
"6" -> setMultipleImage("青鬃马", R.mipmap.anim_wealth6)
|
"6" -> setMultipleImage(name, R.mipmap.anim_wealth6)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,24 +7,24 @@ import androidx.core.view.isVisible
|
|||||||
import androidx.lifecycle.ViewModelProviders
|
import androidx.lifecycle.ViewModelProviders
|
||||||
import androidx.lifecycle.lifecycleScope
|
import androidx.lifecycle.lifecycleScope
|
||||||
import com.blankj.utilcode.util.LogUtils
|
import com.blankj.utilcode.util.LogUtils
|
||||||
import com.xscm.moduleutil.base.BaseBottomFragmentDialog
|
|
||||||
import com.xscm.modulemain.R
|
import com.xscm.modulemain.R
|
||||||
import com.xscm.modulemain.activity.room.activity.RoomActivity
|
import com.xscm.modulemain.activity.room.activity.RoomActivity
|
||||||
import com.xscm.modulemain.activity.room.presenter.RoomViewModel
|
import com.xscm.modulemain.activity.room.presenter.RoomViewModel
|
||||||
import com.xscm.modulemain.databinding.DialogBoxMain2Binding
|
import com.xscm.modulemain.databinding.DialogBoxMain2Binding
|
||||||
|
import com.xscm.moduleutil.base.BaseBottomFragmentDialog
|
||||||
import com.xscm.moduleutil.bean.room.refining.MonsterEndBean
|
import com.xscm.moduleutil.bean.room.refining.MonsterEndBean
|
||||||
import com.xscm.moduleutil.bean.room.refining.MonsterInfoBean
|
import com.xscm.moduleutil.bean.room.refining.MonsterInfoBean
|
||||||
import com.xscm.moduleutil.bean.room.refining.OpenMonsterBean
|
import com.xscm.moduleutil.bean.room.refining.OpenMonsterBean
|
||||||
|
import com.xscm.moduleutil.dialog.RechargeDialogFragment
|
||||||
import com.xscm.moduleutil.utils.CountDownUtil
|
import com.xscm.moduleutil.utils.CountDownUtil
|
||||||
import com.xscm.moduleutil.utils.ImageUtils
|
import com.xscm.moduleutil.utils.ImageUtils
|
||||||
import com.yuyin.module_live.ui.baoxiang5.BoxInputMultipleDialog
|
import com.yuyin.module_live.ui.baoxiang5.BoxInputMultipleDialog
|
||||||
import com.yuyin.module_live.ui.baoxiang5.BoxRankDialog2
|
|
||||||
import com.yuyin.module_live.ui.baoxiang5.OnSelectResultListener
|
import com.yuyin.module_live.ui.baoxiang5.OnSelectResultListener
|
||||||
|
|
||||||
import kotlinx.coroutines.CoroutineScope
|
import kotlinx.coroutines.CoroutineScope
|
||||||
import kotlinx.coroutines.cancel
|
import kotlinx.coroutines.cancel
|
||||||
import org.greenrobot.eventbus.EventBus
|
import org.greenrobot.eventbus.EventBus
|
||||||
import org.greenrobot.eventbus.Subscribe
|
import org.greenrobot.eventbus.Subscribe
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Author qx
|
* @Author qx
|
||||||
* @Time 2026/1/28 10:08
|
* @Time 2026/1/28 10:08
|
||||||
@@ -86,6 +86,21 @@ class BoxMainDialog2() : BaseBottomFragmentDialog<DialogBoxMain2Binding>(R.layou
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mBinding.ivDh.setOnClickListener {
|
||||||
|
if (this::liveActivity.isInitialized){
|
||||||
|
|
||||||
|
// ARouter.getInstance().build(ARouteConstants.CURRENCY).navigation();
|
||||||
|
RechargeDialogFragment.show(
|
||||||
|
"",
|
||||||
|
null,
|
||||||
|
liveActivity.supportFragmentManager,
|
||||||
|
"0",
|
||||||
|
"0"
|
||||||
|
)
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
mBinding.btnConfirm.setOnClickListener {
|
mBinding.btnConfirm.setOnClickListener {
|
||||||
mBinding.llResult.visibility = View.GONE
|
mBinding.llResult.visibility = View.GONE
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.yuyin.module_live.ui.baoxiang5
|
package com.xscm.modulemain.dialog.refining
|
||||||
|
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.view.View
|
import android.view.View
|
||||||
|
|||||||
7
MainModule/src/main/res/font/fredoka_one.xml
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
app:fontProviderAuthority="com.google.android.gms.fonts"
|
||||||
|
app:fontProviderPackage="com.google.android.gms"
|
||||||
|
app:fontProviderQuery="Fredoka One"
|
||||||
|
app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
|
||||||
|
</font-family>
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
android:id="@+id/constraint"
|
android:id="@+id/constraint"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="608dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="bottom"
|
android:layout_gravity="bottom"
|
||||||
android:background="@mipmap/box_bg"
|
android:background="@mipmap/box_bg"
|
||||||
app:layout_constraintBottom_toBottomOf="parent">
|
app:layout_constraintBottom_toBottomOf="parent">
|
||||||
@@ -219,10 +219,11 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:background="@mipmap/bg_box2_balance"
|
android:background="@mipmap/bg_box2_balance"
|
||||||
|
android:layout_marginVertical="@dimen/dp_20"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintLeft_toLeftOf="parent"
|
app:layout_constraintLeft_toLeftOf="parent"
|
||||||
app:layout_constraintRight_toRightOf="parent"
|
android:layout_marginStart="@dimen/dp_47"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/tv_multiple2">
|
app:layout_constraintTop_toBottomOf="@+id/tv_multiple2">
|
||||||
|
|
||||||
<com.xscm.moduleutil.widget.ShapeRedTextView
|
<com.xscm.moduleutil.widget.ShapeRedTextView
|
||||||
@@ -239,18 +240,29 @@
|
|||||||
tools:text="666666" />
|
tools:text="666666" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/iv_dh"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:src="@mipmap/anim_dh"
|
||||||
|
app:layout_constraintStart_toEndOf="@+id/ll_money"
|
||||||
|
app:layout_constraintTop_toTopOf="@+id/ll_money"
|
||||||
|
android:layout_marginStart="@dimen/dp_15"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/ll_money" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/textView1"
|
android:id="@+id/textView1"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:fontFamily="@font/fredoka_one"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:text="玉狮子"
|
|
||||||
android:textColor="#FFBB49"
|
android:textColor="#FFBB49"
|
||||||
android:textSize="18sp"
|
android:textSize="18sp"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
|
app:layout_constraintBottom_toTopOf="@id/tv_multiple1"
|
||||||
app:layout_constraintLeft_toLeftOf="@id/tv_multiple1"
|
app:layout_constraintLeft_toLeftOf="@id/tv_multiple1"
|
||||||
app:layout_constraintRight_toRightOf="@id/tv_multiple1"
|
app:layout_constraintRight_toRightOf="@id/tv_multiple1"
|
||||||
app:layout_constraintBottom_toTopOf="@id/tv_multiple1" />
|
tools:text="玉狮子" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/textView2"
|
android:id="@+id/textView2"
|
||||||
@@ -258,6 +270,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:text=""
|
android:text=""
|
||||||
|
android:fontFamily="@font/fredoka_one"
|
||||||
android:textColor="#FFBB49"
|
android:textColor="#FFBB49"
|
||||||
android:textSize="18sp"
|
android:textSize="18sp"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
@@ -271,6 +284,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:text=""
|
android:text=""
|
||||||
|
android:fontFamily="@font/fredoka_one"
|
||||||
android:textColor="#FFBB49"
|
android:textColor="#FFBB49"
|
||||||
android:textSize="18sp"
|
android:textSize="18sp"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
@@ -284,6 +298,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:text=""
|
android:text=""
|
||||||
|
android:fontFamily="@font/fredoka_one"
|
||||||
android:textColor="#FFBB49"
|
android:textColor="#FFBB49"
|
||||||
android:textSize="18sp"
|
android:textSize="18sp"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
@@ -297,6 +312,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:text=""
|
android:text=""
|
||||||
|
android:fontFamily="@font/fredoka_one"
|
||||||
android:textColor="#FFBB49"
|
android:textColor="#FFBB49"
|
||||||
android:textSize="18sp"
|
android:textSize="18sp"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
@@ -310,6 +326,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:text=""
|
android:text=""
|
||||||
|
android:fontFamily="@font/fredoka_one"
|
||||||
android:textColor="#FFBB49"
|
android:textColor="#FFBB49"
|
||||||
android:textSize="18sp"
|
android:textSize="18sp"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
@@ -322,7 +339,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:text="玉狮子"
|
tools:text="玉狮子"
|
||||||
android:textColor="#FFBB49"
|
android:textColor="#FFBB49"
|
||||||
android:textSize="18sp"
|
android:textSize="18sp"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
@@ -335,11 +352,10 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:text="乌骓马"
|
tools:text="乌骓马"
|
||||||
android:textColor="#FFBB49"
|
android:textColor="#FFBB49"
|
||||||
android:textSize="18sp"
|
android:textSize="18sp"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
android:layout_marginTop="10dp"
|
|
||||||
app:layout_constraintLeft_toLeftOf="@id/tv_multiple2"
|
app:layout_constraintLeft_toLeftOf="@id/tv_multiple2"
|
||||||
app:layout_constraintRight_toRightOf="@id/tv_multiple2"
|
app:layout_constraintRight_toRightOf="@id/tv_multiple2"
|
||||||
app:layout_constraintTop_toTopOf="@+id/anim_wealth2" />
|
app:layout_constraintTop_toTopOf="@+id/anim_wealth2" />
|
||||||
@@ -349,7 +365,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:text="乌云驹"
|
tools:text="乌云驹"
|
||||||
android:textColor="#FFBB49"
|
android:textColor="#FFBB49"
|
||||||
android:textSize="18sp"
|
android:textSize="18sp"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
@@ -362,7 +378,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:text="追风驹"
|
tools:text="追风驹"
|
||||||
android:textColor="#FFBB49"
|
android:textColor="#FFBB49"
|
||||||
android:textSize="18sp"
|
android:textSize="18sp"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
@@ -375,7 +391,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:text="青鬃马"
|
tools:text="青鬃马"
|
||||||
android:textColor="#FFBB49"
|
android:textColor="#FFBB49"
|
||||||
android:textSize="18sp"
|
android:textSize="18sp"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
@@ -388,7 +404,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:text="黄彪马"
|
tools:text="黄彪马"
|
||||||
android:textColor="#FFBB49"
|
android:textColor="#FFBB49"
|
||||||
android:textSize="18sp"
|
android:textSize="18sp"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
@@ -411,7 +427,7 @@
|
|||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
app:layout_constraintBottom_toBottomOf="@id/constraint"
|
app:layout_constraintBottom_toBottomOf="@id/constraint"
|
||||||
app:layout_constraintTop_toTopOf="@id/constraint"
|
app:layout_constraintTop_toTopOf="@id/constraint"
|
||||||
tools:visibility="visible">
|
tools:visibility="gone">
|
||||||
|
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
|
|||||||
BIN
MainModule/src/main/res/mipmap-xxhdpi/anim_dh.webp
Normal file
|
After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 19 KiB |
|
Before Width: | Height: | Size: 75 KiB After Width: | Height: | Size: 89 KiB |
|
Before Width: | Height: | Size: 802 KiB After Width: | Height: | Size: 60 KiB |
|
Before Width: | Height: | Size: 648 KiB After Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 650 KiB After Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 650 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 644 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 9.4 KiB After Width: | Height: | Size: 10 KiB |
17
MainModule/src/main/res/values/font_certs.xml
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<array name="com_google_android_gms_fonts_certs">
|
||||||
|
<item>@array/com_google_android_gms_fonts_certs_dev</item>
|
||||||
|
<item>@array/com_google_android_gms_fonts_certs_prod</item>
|
||||||
|
</array>
|
||||||
|
<string-array name="com_google_android_gms_fonts_certs_dev">
|
||||||
|
<item>
|
||||||
|
MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAeFw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBANbOLggKv+IxTdGNs8/TGFy0PTP6DHThvbbR24kT9ixcOd9W+EaBPWW+wPPKQmsHxajtWjmQwWfna8mZuSeJS48LIgAZlKkpFeVyxW0qMBujb8X8ETrWy550NaFtI6t9+u7hZeTfHwqNvacKhp1RbE6dBRGWynwMVX8XW8N1+UjFaq6GCJukT4qmpN2afb8sCjUigq0GuMwYXrFVee74bQgLHWGJwPmvmLHC69EH6kWr22ijx4OKXlSIx2xT1AsSHee70w5iDBiK4aph27yH3TxkXy9V89TDdexAcKk/cVHYNnDBapcavl7y0RiQ4biu8ymM8Ga/nmzhRKya6G0cGw8CAQOjgfwwgfkwHQYDVR0OBBYEFI0cxb6VTEM8YYY6FbBMvAPyT+CyMIHJBgNVHSMEgcEwgb6AFI0cxb6VTEM8YYY6FbBMvAPyT+CyoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJANWFuGx90071MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBABnTDPEF+3iSP0wNfdIjIz1AlnrPzgAIHVvXxunW7SBrDhEglQZBbKJEk5kT0mtKoOD1JMrSu1xuTKEBahWRbqHsXclaXjoBADb0kkjVEJu/Lh5hgYZnOjvlba8Ld7HCKePCVePoTJBdI4fvugnL8TsgK05aIskyY0hKI9L8KfqfGTl1lzOv2KoWD0KWwtAWPoGChZxmQ+nBli+gwYMzM1vAkP+aayLe0a1EQimlOalO762r0GXO0ks+UeXde2Z4e+8S/pf7pITEI/tP+MxJTALw9QUWEv9lKTk+jkbqxbsh8nfBUapfKqYn0eidpwq2AzVp3juYl7//fKnaPhJD9gs=
|
||||||
|
</item>
|
||||||
|
</string-array>
|
||||||
|
<string-array name="com_google_android_gms_fonts_certs_prod">
|
||||||
|
<item>
|
||||||
|
MIIEQzCCAyugAwIBAgIJAMLgh0ZkSjCNMA0GCSqGSIb3DQEBBAUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAKtWLgDYO6IIrgqWbxJOKdoR8qtW0I9Y4sypEwPpt1TTcvZApxsdyxMJZ2JORland2qSGT2y5b+3JKkedxiLDmpHpDsz2WCbdxgxRczfey5YZnTJ4VZbH0xqWVW/8lGmPav5xVwnIiJS6HXk+BVKZF+JcWjAsb/GEuq/eFdpuzSqeYTcfi6idkyugwfYwXFU1+5fZKUaRKYCwkkFQVfcAs1fXA5V+++FGfvjJ/CxURaSxaBvGdGDhfXE28LWuT9ozCl5xw4Yq5OGazvV24mZVSoOO0yZ31j7kYvtwYK6NeADwbSxDdJEqO4k//0zOHKrUiGYXtqw/A0LFFtqoZKFjnkCAQOjgdkwgdYwHQYDVR0OBBYEFMd9jMIhF1Ylmn/Tgt9r45jk14alMIGmBgNVHSMEgZ4wgZuAFMd9jMIhF1Ylmn/Tgt9r45jk14aloXikdjB0MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWSCCQDC4IdGZEowjTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBt0lLO74UwLDYKqs6Tm8/yzKkEu116FmH4rkaymUIE0P9KaMftGlMexFlaYjzmB2OxZyl6euNXEsQH8gjwyxCUKRJNexBiGcCEyj6z+a1fuHHvkiaai+KL8W1EyNmgjmyy8AW7P+LLlkR+ho5zEHatRbM/YAnqGcFh5iZBqpknHf1SKMXFh4dd239FJ1jWYfbMDMy3NS5CTMQ2XFI1MvcyUTdZPErjQfTbQe3aDQsQcafEQPD+nqActifKZ0Np0IS9L9kR/wbNvyz6ENwPiTrjV2KRkEjH78ZMcUQXg0L3BYHJ3lc69Vs5Ddf9uUGGMYldX3WfMBEmh/9iFBDAaTCK
|
||||||
|
</item>
|
||||||
|
</string-array>
|
||||||
|
</resources>
|
||||||
6
MainModule/src/main/res/values/preloaded_fonts.xml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<array name="preloaded_fonts" translatable="false">
|
||||||
|
<item>@font/fredoka_one</item>
|
||||||
|
</array>
|
||||||
|
</resources>
|
||||||