diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftRoomAdapter.java b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftRoomAdapter.java index c2bae659..fbaa6fcd 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftRoomAdapter.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftRoomAdapter.java @@ -21,6 +21,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.constraintlayout.widget.ConstraintLayout; +import com.blankj.utilcode.util.LogUtils; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.hjq.toast.ToastUtils; @@ -78,8 +79,6 @@ public class GiftRoomAdapter extends BaseQuickAdapter { // RoonGiftModel clickedModel = (RoonGiftModel) v.getTag(); if (giftModel.getIs_lock() == 0) { @@ -121,13 +120,7 @@ public class GiftRoomAdapter extends BaseQuickAdapter baseModel = response.body(); if (baseModel.getCode() == 1) { - ToastUtils.showLong(baseModel.getMsg()); + ToastUtils.showLong("热度卡使用成功"); observer.onNext(baseModel.getMsg()); } else if (baseModel.getCode() == 301) { setCode301(baseModel.getMsg()); diff --git a/BaseModule/src/main/res/layout/me_view_decoration_head.xml b/BaseModule/src/main/res/layout/me_view_decoration_head.xml index c5ee0fa2..71b86a71 100644 --- a/BaseModule/src/main/res/layout/me_view_decoration_head.xml +++ b/BaseModule/src/main/res/layout/me_view_decoration_head.xml @@ -19,7 +19,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintWidth_percent="0.95" + app:layout_constraintWidth_percent="0.8" app:riv_oval="true" /> @@ -32,7 +32,8 @@ android:scaleType="fitXY" app:layout_constraintBottom_toBottomOf="parent" 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_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/lxcs_iocn.webp b/BaseModule/src/main/res/mipmap-xxhdpi/lxcs_iocn.webp index 03bf4d79..a05c1596 100644 Binary files a/BaseModule/src/main/res/mipmap-xxhdpi/lxcs_iocn.webp and b/BaseModule/src/main/res/mipmap-xxhdpi/lxcs_iocn.webp differ diff --git a/MainModule/src/main/AndroidManifest.xml b/MainModule/src/main/AndroidManifest.xml index 38e46cf6..d206a9f1 100644 --- a/MainModule/src/main/AndroidManifest.xml +++ b/MainModule/src/main/AndroidManifest.xml @@ -242,6 +242,10 @@ android:name=".service.CancelNoticeService" android:enabled="true" android:exported="true" /> + + \ No newline at end of file diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/PlaceholderGiftFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/PlaceholderGiftFragment.java index f260ebb5..d63e64b8 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/PlaceholderGiftFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/PlaceholderGiftFragment.java @@ -79,7 +79,7 @@ public class PlaceholderGiftFragment extends Fragment { public void onUserClick(GiftUserWallBean.GiftWallBean emotion) { // 处理用户点击事件 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); } }); } diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/GiftWallAdapter.java b/MainModule/src/main/java/com/xscm/modulemain/adapter/GiftWallAdapter.java index 589a59c4..a84384c6 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/adapter/GiftWallAdapter.java +++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/GiftWallAdapter.java @@ -97,9 +97,9 @@ public class GiftWallAdapter extends BaseAdapter { public void onClick(View v) { if (item.is_liang()) { 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); - } +// } } } } diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/refining/BoxRankListAdapter2.kt b/MainModule/src/main/java/com/xscm/modulemain/adapter/refining/BoxRankListAdapter2.kt index ee57f833..b4ff240c 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/adapter/refining/BoxRankListAdapter2.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/refining/BoxRankListAdapter2.kt @@ -13,7 +13,7 @@ class BoxRankListAdapter2 : override fun convert(helper: BaseViewHolder, item: MonsterUserLogBean) { 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}") diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/refining/BoxRecordListAdapter2.kt b/MainModule/src/main/java/com/xscm/modulemain/adapter/refining/BoxRecordListAdapter2.kt index 73371198..c1b572a4 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/adapter/refining/BoxRecordListAdapter2.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/refining/BoxRecordListAdapter2.kt @@ -18,15 +18,15 @@ class BoxRecordListAdapter2 : when(item.is_join){ // 1已中奖，2未中奖，3未参与 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,"已中奖") } 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,"未中奖") } 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,"未参与") } else -> { diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java index c7c1f7fa..1a008ff2 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java @@ -529,7 +529,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment blindBoxStatus) { if (blindBoxStatus != null && !blindBoxStatus.isEmpty()) { - RoomSettingBean moreParent = new RoomSettingBean("活动", null, null, null, -1, read, isSelected, true, false); + RoomSettingBean moreParent = null; List moreChildren = new ArrayList<>(); for (int i = 0; i < blindBoxStatus.size(); i++) { int giftBagId = blindBoxStatus.get(i).getGift_bag_id(); @@ -748,9 +748,9 @@ public class RoomSettingFragment extends BaseMvpDialogFragment + // 文本改变后的操作 + val text = editable?.toString() ?: "" + mBinding.tvIntegral.text = "金币${(text.toInt() * monsterInfoBean.open_monster_price.toInt())}/$money" + } + + } private fun setupRecyclerView() { @@ -98,24 +109,25 @@ class BoxInputMultipleDialog() : private fun updateIntegralText() { val num = mBinding.number.text.toString().ifEmpty { "0" }.toIntOrNull() ?: 0 - viewModel.monsterInfo.value?.let { - mBinding.tvIntegral.text = "金币${(num * it.open_monster_price.toInt())}/$money" - } +// viewModel.monsterInfo.value?.let { +// 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) { 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() { when (multiple) { - "1" -> setMultipleImage("玉狮子", R.mipmap.anim_wealth1) - "2" -> setMultipleImage("乌骓马", R.mipmap.anim_wealth2) - "3" -> setMultipleImage("追风驹", R.mipmap.anim_wealth3) - "4" -> setMultipleImage("乌云驹", R.mipmap.anim_wealth4) - "5" -> setMultipleImage("黄彪马", R.mipmap.anim_wealth5) - "6" -> setMultipleImage("青鬃马", R.mipmap.anim_wealth6) + "1" -> setMultipleImage(name, R.mipmap.anim_wealth1) + "2" -> setMultipleImage(name, R.mipmap.anim_wealth2) + "3" -> setMultipleImage(name, R.mipmap.anim_wealth3) + "4" -> setMultipleImage(name, R.mipmap.anim_wealth4) + "5" -> setMultipleImage(name, R.mipmap.anim_wealth5) + "6" -> setMultipleImage(name, R.mipmap.anim_wealth6) } } diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/refining/BoxMainDialog2.kt b/MainModule/src/main/java/com/xscm/modulemain/dialog/refining/BoxMainDialog2.kt index c118779b..b196c3ee 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/refining/BoxMainDialog2.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/refining/BoxMainDialog2.kt @@ -7,24 +7,24 @@ import androidx.core.view.isVisible import androidx.lifecycle.ViewModelProviders import androidx.lifecycle.lifecycleScope import com.blankj.utilcode.util.LogUtils -import com.xscm.moduleutil.base.BaseBottomFragmentDialog import com.xscm.modulemain.R import com.xscm.modulemain.activity.room.activity.RoomActivity import com.xscm.modulemain.activity.room.presenter.RoomViewModel 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.MonsterInfoBean 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.ImageUtils 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 kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.cancel import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe + /** * @Author qx * @Time 2026/1/28 10:08 @@ -86,6 +86,21 @@ class BoxMainDialog2() : BaseBottomFragmentDialog(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.llResult.visibility = View.GONE diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/refining/BoxRankDialog2.kt b/MainModule/src/main/java/com/xscm/modulemain/dialog/refining/BoxRankDialog2.kt index 5fd703e1..48fded51 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/refining/BoxRankDialog2.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/refining/BoxRankDialog2.kt @@ -1,4 +1,4 @@ -package com.yuyin.module_live.ui.baoxiang5 +package com.xscm.modulemain.dialog.refining import android.os.Bundle import android.view.View diff --git a/MainModule/src/main/res/font/fredoka_one.xml b/MainModule/src/main/res/font/fredoka_one.xml new file mode 100644 index 00000000..749398c0 --- /dev/null +++ b/MainModule/src/main/res/font/fredoka_one.xml @@ -0,0 +1,7 @@ + + + diff --git a/MainModule/src/main/res/layout/dialog_box_main2.xml b/MainModule/src/main/res/layout/dialog_box_main2.xml index 6a996717..3ae30598 100644 --- a/MainModule/src/main/res/layout/dialog_box_main2.xml +++ b/MainModule/src/main/res/layout/dialog_box_main2.xml @@ -11,7 +11,7 @@ @@ -219,10 +219,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@mipmap/bg_box2_balance" + android:layout_marginVertical="@dimen/dp_20" android:gravity="center" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" - app:layout_constraintRight_toRightOf="parent" + android:layout_marginStart="@dimen/dp_47" app:layout_constraintTop_toBottomOf="@+id/tv_multiple2"> + + + tools:text="玉狮子" /> @@ -349,7 +365,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center" - android:text="乌云驹" + tools:text="乌云驹" android:textColor="#FFBB49" android:textSize="18sp" android:textStyle="bold" @@ -362,7 +378,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center" - android:text="追风驹" + tools:text="追风驹" android:textColor="#FFBB49" android:textSize="18sp" android:textStyle="bold" @@ -375,7 +391,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center" - android:text="青鬃马" + tools:text="青鬃马" android:textColor="#FFBB49" android:textSize="18sp" android:textStyle="bold" @@ -388,7 +404,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center" - android:text="黄彪马" + tools:text="黄彪马" android:textColor="#FFBB49" android:textSize="18sp" android:textStyle="bold" @@ -411,7 +427,7 @@ android:visibility="gone" app:layout_constraintBottom_toBottomOf="@id/constraint" app:layout_constraintTop_toTopOf="@id/constraint" - tools:visibility="visible"> + tools:visibility="gone"> + + + @array/com_google_android_gms_fonts_certs_dev + @array/com_google_android_gms_fonts_certs_prod + + + + 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 + + + diff --git a/MainModule/src/main/res/values/preloaded_fonts.xml b/MainModule/src/main/res/values/preloaded_fonts.xml new file mode 100644 index 00000000..b723bee7 --- /dev/null +++ b/MainModule/src/main/res/values/preloaded_fonts.xml @@ -0,0 +1,6 @@ + + + + @font/fredoka_one + +