From 4a21c866f4299293a93fb6a4a831725c97795f34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Fri, 26 Sep 2025 21:19:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../giftLottery/TourClubDialogFragment.java   | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/TourClubDialogFragment.java b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/TourClubDialogFragment.java
index 820d54a..3b4d4ff 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/TourClubDialogFragment.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/TourClubDialogFragment.java
@@ -2,6 +2,7 @@ package com.xscm.moduleutil.dialog.giftLottery;
 
 import android.app.Dialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.Handler;
@@ -16,18 +17,23 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.LinearSnapHelper;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.blankj.utilcode.util.GsonUtils;
 import com.xscm.moduleutil.R;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
 import com.xscm.moduleutil.bean.GiftBean;
 import com.xscm.moduleutil.bean.MqttXlhEnd;
 import com.xscm.moduleutil.bean.RoomMessageEvent;
 import com.xscm.moduleutil.bean.WalletBean;
+import com.xscm.moduleutil.bean.XLHBean;
 import com.xscm.moduleutil.bean.blindboxwheel.BlindBoxBean;
 import com.xscm.moduleutil.bean.blindboxwheel.BlindReslutBean;
 import com.xscm.moduleutil.bean.blindboxwheel.XlhDrawBean;
 import com.xscm.moduleutil.databinding.FragmentTourClubDialogBinding;
 import com.xscm.moduleutil.dialog.RechargeDialogFragment;
 import com.xscm.moduleutil.dialog.WebViewDialog;
+import com.xscm.moduleutil.event.MqttBean;
+import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.widget.CenterScrollHelper;
 import com.xscm.moduleutil.widget.EqualSpaceItemDecoration;
@@ -51,7 +57,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
     private CountDownTimer mCountDownTimer;
     private long endTime; // 服务器返回的结束时间戳
     private String num;
-    private NewXlhRankingDialog newXlhRankingDialog;
+    private XlhRankingDialog xlhRankingDialog;
     private XlhRecordDialog xlhRecordDialog;
     private XlhObtainDialog xlhObtainDialog;
 
@@ -293,12 +299,12 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
             dialog.show();
         } else if (id == R.id.tv_bd) {
             // 如果当前dialog存在且正在显示，先关闭
-            if (newXlhRankingDialog != null && newXlhRankingDialog.isVisible()) {
-                newXlhRankingDialog.dismiss();
+            if (xlhRankingDialog != null && xlhRankingDialog.isVisible()) {
+                xlhRankingDialog.dismiss();
             }
 
-            newXlhRankingDialog =  NewXlhRankingDialog.newInstance(roomId);
-            newXlhRankingDialog.show(getChildFragmentManager(), "newXlhRankingDialog");
+            xlhRankingDialog = XlhRankingDialog.newInstance(roomId,0);
+            xlhRankingDialog.show(getChildFragmentManager(), "XlhRankingDialog");
         } else if (id == R.id.tv_jl) {
             // 如果当前dialog存在且正在显示，先关闭
             if (xlhRecordDialog != null && xlhRecordDialog.isVisible()) {
@@ -368,6 +374,9 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
 
                 mBinding.gvXyz.setModel(blindBoxBean.getXlh_user());
             }
+            mBinding.gvXyz.setIsLuckUser(true);
+            if (blindBoxBean.getHomeowner_user()!=null){
+                mBinding.gvFz.setModel(blindBoxBean.getHomeowner_user());
 
             }
             mBinding.gvFz.setIsLuckUser(false);
@@ -447,9 +456,6 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
                 long remainingSeconds = seconds % 60;
                 updateCountdownDisplay((int) minutes, (int) remainingSeconds);
             }
-            mBinding.gvXyz.setIsLuckUser(true);
-            if (blindBoxBean.getHomeowner_user()!=null){
-                mBinding.gvFz.setModel(blindBoxBean.getHomeowner_user());
 
             @Override
             public void onFinish() {
@@ -527,8 +533,8 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPre
         }
 
         // 如果当前dialog存在且正在显示，先关闭
-        if (newXlhRankingDialog != null && newXlhRankingDialog.isVisible()) {
-            newXlhRankingDialog.dismiss();
+        if (xlhRankingDialog != null && xlhRankingDialog.isVisible()) {
+            xlhRankingDialog.dismiss();
         }
 
         if (xlhObtainDialog != null && xlhObtainDialog.isShowing()) {