1:修改马迎新春的弹框提示，展示背景

MainModule/src/main/java/com/xscm/modulemain/dialog/TourClubDialogFragment.java

@@ -6,6 +6,7 @@ import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.Handler;
 import android.view.Gravity;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
@@ -86,6 +87,8 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
     private static final int AUTO_SCROLL_DELAY = 1000; // 1秒滚动一个item
     private boolean vCheckbox=false;
 
+    private Dialog dialog;
+
     @Override
     protected GiftLotteryPresenter bindPresenter() {
         return new GiftLotteryPresenter(this, getActivity());
@@ -107,9 +110,10 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
     @Nullable
     @Override
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
-        Dialog dialog = super.onCreateDialog(savedInstanceState);
+        dialog = super.onCreateDialog(savedInstanceState);
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
         dialog.setCancelable(true);
+        dialog.setCanceledOnTouchOutside(true);
         return dialog;
     }
 
@@ -268,6 +272,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
                 prepareForNewLottery();
                 num = "1";
                 MvpPre.xlhChou(roomId, num);
+
             } else {
 //                com.hjq.toast.ToastUtils.show("正在抽奖中...");
             }
@@ -322,6 +327,12 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
             vCheckbox=mBinding.vCheckbox.isSelected();
         }
 
+        if (isDrawing){
+            dialog.setCancelable(false);
+            dialog.setCanceledOnTouchOutside(false);
+        }
+
+
         // 通过 ID 获取资源名称
         String viewName = "";
         try {
@@ -1011,6 +1022,8 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
      */
     private void showResultDialog(List<XlhDrawBean> data) {
         isDrawing = false;
+        dialog.setCancelable(true);
+        dialog.setCanceledOnTouchOutside(true);
         // 创建并显示对话框
         // 关闭之前可能存在的对话框
 //        if (xlhObtainDialog != null && xlhObtainDialog.isShowing()) {
@@ -1023,6 +1036,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
             @Override
             public void onPlayAgainClick() {
                 isDrawing = true;
+
                 // 处理再玩一次点击事件
                 MvpPre.xlhChou(roomId, num);
             }

MainModule/src/main/java/com/xscm/modulemain/dialog/refining/BoxInputMultipleDialog.kt

@@ -29,12 +29,18 @@ class BoxInputMultipleDialog() :
     private var money = ""
     private lateinit var monsterInfoBean: MonsterInfoBean
 
-    constructor(multiple: String, name: String, onSelectResultListener: OnSelectResultListener, liveActivity: RoomActivity, monsterInfoBean:MonsterInfoBean) : this() {
+    constructor(
+        multiple: String,
+        name: String,
+        onSelectResultListener: OnSelectResultListener,
+        liveActivity: RoomActivity,
+        monsterInfoBean: MonsterInfoBean
+    ) : this() {
         this.onSelectResultListener = onSelectResultListener
         this.multiple = multiple
         this.name = name
-        this.liveActivity=liveActivity
-        this.monsterInfoBean=monsterInfoBean
+        this.liveActivity = liveActivity
+        this.monsterInfoBean = monsterInfoBean
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -84,9 +90,14 @@ class BoxInputMultipleDialog() :
 
 
         mBinding.number.doAfterTextChanged { editable ->
-            // 文本改变后的操作
-            val text = editable?.toString() ?: ""
-            mBinding.tvIntegral.text = "金币${(text.toInt() * monsterInfoBean.open_monster_price.toInt())}/$money"
+            var text: String = "0"
+            if (editable != null && editable.toString().isNotEmpty()) {
+                // 文本改变后的操作
+                text = editable.toString()
+            }
+            mBinding.tvIntegral.text =
+                "金币${(text.toInt() * monsterInfoBean.open_monster_price.toInt())}/$money"
+
         }
 
 
@@ -96,7 +107,7 @@ class BoxInputMultipleDialog() :
         mBinding.rvContainer.itemAnimator = null
         mBinding.rvContainer.layoutManager = GridLayoutManager(requireContext(), 3)
         val adapter = BoxInputMultipleAdapter()
-        adapter.setNewData(arrayListOf("1","10", "20", "30", "50", "100"))
+        adapter.setNewData(arrayListOf("1", "10", "20", "30", "50", "100"))
         adapter.setOnItemClickListener { _, _, position ->
             adapter.setSelectPosition(position)
             mBinding.number.setText(adapter.data[position])
@@ -112,12 +123,13 @@ class BoxInputMultipleDialog() :
 //        viewModel.monsterInfo.value?.let {
 //            mBinding.tvIntegral.text = "金币${(num * it.open_monster_price.toInt())}/$money"
 //        }
-        mBinding.tvIntegral.text = "金币${(num * monsterInfoBean.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 = "金币${(info.open_monster_price.toInt())}/$money"
+        mBinding.tvTextNum.text = "${info.open_monster_price}金币/次"
+        mBinding.tvIntegral.text = "金币${(info.open_monster_price.toInt())}/$money"
     }
 
     private fun setupMultipleImages() {

MainModule/src/main/java/com/xscm/modulemain/dialog/refining/BoxMainDialog2.kt

@@ -190,26 +190,32 @@ class BoxMainDialog2() :
 
     @Subscribe // 个人抽奖播报
     fun openMonster(openMonster: OpenMonsterBean) {
-        if (openMonster.is_win == 1) {
-            mBinding.llResult.visibility = View.VISIBLE
-            mBinding.tvTypeName.text = "中奖：${openMonster.type_name}"
-            ImageUtils.loadHead(openMonster.base_image, mBinding.ivGift)
-//            GlideUtil.loadImglogo(requireContext(), openMonster.base_image, mBinding.ivGift)
-            mBinding.tvGiftName.text = openMonster.gift_name + "*" + openMonster.num
-            mBinding.tvGiftPrice.text = openMonster.gift_price
-        } else {
-            mBinding.tvTypeName2.text = "中奖：${openMonster.type_name}"
-            mBinding.llFial.visibility = View.VISIBLE
-        }
+//        if (openMonster.is_win == 1) {
+//            mBinding.llResult.visibility = View.VISIBLE
+//            mBinding.tvTypeName.text = "中奖：${openMonster.type_name}"
+//            ImageUtils.loadHead(openMonster.base_image, mBinding.ivGift)
+////            GlideUtil.loadImglogo(requireContext(), openMonster.base_image, mBinding.ivGift)
+//            mBinding.tvGiftName.text = openMonster.gift_name + "*" + openMonster.num
+//            mBinding.tvGiftPrice.text = openMonster.gift_price
+//        } else {
+//            mBinding.tvTypeName2.text = "中奖：${openMonster.type_name}"
+//            mBinding.llFial.visibility = View.VISIBLE
+//        }
     }
 
 
     @Subscribe // 抽奖结束播报
     fun monsterEnd(monsterEnd: MonsterEndBean) {
-        if (monsterEnd.is_finsh == 1) {
+//        if (monsterEnd.is_push_message == 1) {
 //            mBinding.tvTypeName2.text = "中奖财神：${monsterEnd.win_type_name}"
-//            mBinding.llFial.visibility = View.VISIBLE
-        }
+
+            mBinding.llResult.visibility = View.VISIBLE
+            mBinding.tvTypeName.text = "中奖：${monsterEnd.win_type_name}"
+            ImageUtils.loadHead(monsterEnd.base_image, mBinding.ivGift)
+//            GlideUtil.loadImglogo(requireContext(), openMonster.base_image, mBinding.ivGift)
+            mBinding.tvGiftName.text = monsterEnd.gift_name + "*" + monsterEnd.num
+            mBinding.tvGiftPrice.text = monsterEnd.total_gift_price.toString()
+//        }
     }
 
 

MainModule/src/main/res/layout/dialog_box_main2.xml

@@ -256,8 +256,9 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/fredoka_one"
                 android:gravity="center"
-                android:textColor="#FFBB49"
-                android:textSize="18sp"
+                android:textColor="#FFEB49"
+                android:background="@mipmap/text_box_bj"
+                android:textSize="16sp"
                 android:textStyle="bold"
                 app:layout_constraintBottom_toTopOf="@id/tv_multiple1"
                 app:layout_constraintLeft_toLeftOf="@id/tv_multiple1"
@@ -271,8 +272,9 @@
                 android:gravity="center"
                 android:text=""
                 android:fontFamily="@font/fredoka_one"
-                android:textColor="#FFBB49"
-                android:textSize="18sp"
+                android:textColor="#FFEB49"
+                android:background="@mipmap/text_box_bj"
+                android:textSize="16sp"
                 android:textStyle="bold"
                 app:layout_constraintBottom_toTopOf="@+id/tv_multiple2"
                 app:layout_constraintLeft_toLeftOf="@id/tv_multiple2"
@@ -285,8 +287,9 @@
                 android:gravity="center"
                 android:text=""
                 android:fontFamily="@font/fredoka_one"
-                android:textColor="#FFBB49"
-                android:textSize="18sp"
+                android:textColor="#FFEB49"
+                android:background="@mipmap/text_box_bj"
+                android:textSize="16sp"
                 android:textStyle="bold"
                 app:layout_constraintLeft_toLeftOf="@id/tv_multiple5"
                 app:layout_constraintRight_toRightOf="@id/tv_multiple5"
@@ -299,8 +302,9 @@
                 android:gravity="center"
                 android:text=""
                 android:fontFamily="@font/fredoka_one"
-                android:textColor="#FFBB49"
-                android:textSize="18sp"
+                android:textColor="#FFEB49"
+                android:background="@mipmap/text_box_bj"
+                android:textSize="16sp"
                 android:textStyle="bold"
                 app:layout_constraintBottom_toBottomOf="@+id/anim_wealth3"
                 app:layout_constraintLeft_toLeftOf="@id/anim_wealth3"
@@ -313,8 +317,9 @@
                 android:gravity="center"
                 android:text=""
                 android:fontFamily="@font/fredoka_one"
-                android:textColor="#FFBB49"
-                android:textSize="18sp"
+                android:textColor="#FFEB49"
+                android:background="@mipmap/text_box_bj"
+                android:textSize="16sp"
                 android:textStyle="bold"
                 app:layout_constraintLeft_toLeftOf="@id/anim_wealth4"
                 app:layout_constraintRight_toRightOf="@id/anim_wealth4"
@@ -327,8 +332,9 @@
                 android:gravity="center"
                 android:text=""
                 android:fontFamily="@font/fredoka_one"
-                android:textColor="#FFBB49"
-                android:textSize="18sp"
+                android:textColor="#FFEB49"
+                android:background="@mipmap/text_box_bj"
+                android:textSize="16sp"
                 android:textStyle="bold"
                 app:layout_constraintBottom_toTopOf="@+id/tv_multiple6"
                 app:layout_constraintEnd_toEndOf="@+id/tv_multiple6"
@@ -422,7 +428,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginHorizontal="15dp"
-            android:background="@mipmap/box_success"
+            android:background="@mipmap/box_success1"
             android:orientation="vertical"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="@id/constraint"