diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 710f9d2..c5bd488 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-08-26T10:07:07.466132Z">
+        <DropdownSelection timestamp="2025-09-02T13:10:06.742287700Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="Default" identifier="serial=emulator-5554;connection=52324642" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=6705124a" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/gradle.properties b/gradle.properties
index 2cb627d..96d1ac2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -30,7 +30,7 @@ isBuildModule=false
 android.injected.testOnly=false
 
 APP_VERSION_NAME=1.0.0
-APP_VERSION_CODE=103
+APP_VERSION_CODE=108
 
 org.gradle.jvm.toolchain.useLegacyAdapters=false
 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15
diff --git a/moduleUtil/src/main/AndroidManifest.xml b/moduleUtil/src/main/AndroidManifest.xml
index 6fd8d9f..1dae0cb 100644
--- a/moduleUtil/src/main/AndroidManifest.xml
+++ b/moduleUtil/src/main/AndroidManifest.xml
@@ -6,16 +6,9 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
 
     <application android:allowBackup="true">
-        <service
-            android:name=".service.MyRoomService"
-            android:enabled="true"
-            android:exported="true"/>
-
-        <activity
-            android:name=".activity.QxActivity"
-            android:exported="false" />
 
         <service
             android:name=".http.FloatingWindowService"
@@ -36,14 +29,17 @@
             android:name=".activity.news.OfficialNoticeActivity"
             android:exported="false" />
 
-        <service android:name="org.eclipse.paho.android.service.MqttService" /> <!-- <receiver android:name="org.eclipse.paho.android.service.AlarmPingSender$AlarmReceiver" -->
+        <service android:name="org.eclipse.paho.android.service.MqttService"
+            android:exported="false"/> <!-- <receiver android:name="org.eclipse.paho.android.service.AlarmPingSender$AlarmReceiver" -->
         <!-- android:enabled="true" -->
         <!-- android:exported="true" -->
         <!-- tools:ignore="Instantiatable" /> -->
 <!--        <service android:name=".service.EMqttService" />-->
-<!--        <service-->
-<!--            android:name=".service.MyMqttService"-->
-<!--            android:foregroundServiceType="dataSync" />-->
+        <service
+            android:name=".service.MyMqttService"
+            android:enabled="true"
+            android:exported="false"
+            android:foregroundServiceType="dataSync" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/activity/news/OfficialNoticeActivity.java b/moduleUtil/src/main/java/com/xscm/moduleutil/activity/news/OfficialNoticeActivity.java
index 3614993..bd21199 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/activity/news/OfficialNoticeActivity.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/activity/news/OfficialNoticeActivity.java
@@ -75,7 +75,7 @@ public class OfficialNoticeActivity extends BaseMvpActivity<NewsPresenter, Activ
                     @Override
                     public void onClick(View view) {
                         if (item.getRoom_id()>0){
-                            ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("room_id", item.getRoom_id() + "").navigation();
+                            ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("roomId", item.getRoom_id() + "").navigation();
                         }else if (item.getRoom_id() == 0 && item.getUrl() != null && !item.getUrl().isEmpty()){
                             ARouter.getInstance().build(ARouteConstants.H5).withString("url", item.getUrl()).navigation();
                         }
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java b/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
index d5f8c53..3a199bf 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
@@ -109,13 +109,13 @@ public class CommonAppContext extends MultiDexApplication {
                 AgoraManager.getInstance(this).init(currentEnvironment.getSwSdkAppId());
                 MessageListenerSingleton.getInstance();
                 CrashReport.initCrashReport(this, "ac3ed4d89f", true);/*bugly初始化*/
-//                ServiceUtils.startService(MyMqttService.class);/*Mqtt初始化*/
-                // 初始化MQTT服务
-                // 获取单例实例
-                MyMqttService mqttService = MyMqttService.getInstance(this);
-
-// 启动服务
-                mqttService.startService();
+//                // 启动 MQTT 服务
+                Intent mqttServiceIntent = new Intent(this, MyMqttService.class);
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    startForegroundService(mqttServiceIntent);
+                } else {
+                    startService(mqttServiceIntent);
+                }
 
                 // 每次启动应用时重置状态
                 SpUtil.getInstance().setBooleanValue("youth_model_shown", false);
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/RoomMessageEvent.java b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/RoomMessageEvent.java
index e77541b..f42991d 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/RoomMessageEvent.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/RoomMessageEvent.java
@@ -88,7 +88,9 @@ public class RoomMessageEvent {
 
         private int online_number;//在线人数
 
-        private BlindBoxBean.XlhData xlh_Data;
+        private BlindBoxBean.XlhData xlh_data;
+        private String from_pit_number;
+        private String to_pit_number;
     }
 
     @Data
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/XLHBean.java b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/XLHBean.java
new file mode 100644
index 0000000..0505640
--- /dev/null
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/XLHBean.java
@@ -0,0 +1,16 @@
+package com.xscm.moduleutil.bean;
+
+import lombok.Data;
+
+/**
+ *@author qx
+ *@data 2025/9/2
+ *@description: 巡乐会开始后推送的信息
+ */
+@Data
+public class XLHBean {
+    private String text;
+    private String room_id;
+
+    private int from_type ;
+}
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/blindboxwheel/BlindBoxBean.java b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/blindboxwheel/BlindBoxBean.java
index c04e0f3..789fd8a 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/blindboxwheel/BlindBoxBean.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/blindboxwheel/BlindBoxBean.java
@@ -21,10 +21,17 @@ public class BlindBoxBean {
     private String title;
     private String rule_url;
     private String rule;
-    private String box_price ;
+    private int box_price ;///每一次抽奖的价格
+    private String xlh_end_time;///巡乐会结束时间
     private int  is_xlh; ///是否开启巡乐会  0 关闭  1 开启
     private Object xlh_data;
     private List<GiftBean> gift_list;
+
+    private GiveGift give_homeowner_gift;//房主礼物
+    private GiveGift locking_gift;//锁定礼物
+
+    private xlhUser xlh_user;//巡乐会中奖用户
+
     public boolean isXlhDataArray() {
         return xlh_data instanceof JsonArray || xlh_data instanceof List;
     }
@@ -124,4 +131,18 @@ public class BlindBoxBean {
     	private int current_num;//当前已抽奖次数
     	private int  status;
     }
+    @Data
+    public static class GiveGift {
+        private int gift_id;
+        private String gift_name;
+        private String base_image;
+        private String gift_num;
+    }
+
+    @Data
+    public static class xlhUser {
+        private String user_id;
+        private String nickname;
+        private String avatar;
+    }
 }
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/EMMessageInfo.java b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/EMMessageInfo.java
index be5aba4..717a4cc 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/EMMessageInfo.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/EMMessageInfo.java
@@ -100,6 +100,9 @@ public class EMMessageInfo implements MultiItemEntity {
     public static final int QXRoomMessageTypeMangH = 1056;
     ///巡乐会
     public static final int QXRoomMessageTypeXlh = 1057;
+
+    ///
+    public static final int QXRoomMessageTypehm = 1039;
     private RoomMessageEvent emMessage;
 
     private int custom = 0;
@@ -154,6 +157,7 @@ public class EMMessageInfo implements MultiItemEntity {
                 case QXRoomMessageTypeRoomOMh:
                 case QXRoomMessageTypeRoomFriendPartDidChanged:
                 case QXRoomMessageTypeSeatDidChanged:
+                case QXRoomMessageTypehm:
                     return 1;
                 case QXRoomMessageTypeGift:
                     return 3;
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/RoomAuction.java b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/RoomAuction.java
index d6b8770..04aed59 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/RoomAuction.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/RoomAuction.java
@@ -40,7 +40,7 @@ public class RoomAuction implements Serializable {
     }
 
     @Data
-    public class AuctionListBean implements Serializable {
+    public static class AuctionListBean implements Serializable {
         private String user_id;
         private String user_code;
         private String nickname;
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/PolicyDialog.java b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/PolicyDialog.java
index e66e941..d6549c7 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/PolicyDialog.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/PolicyDialog.java
@@ -63,7 +63,7 @@ public class PolicyDialog extends Dialog {
                 ds.setUnderlineText(true);
             }
         };
-        spanUtils.append("欢迎使用羽声！\n").append("在使用我们的产品和服务之前，请您先阅读并了解").append("《用户协议》").setClickSpan(clickSpan).append("和").append("《隐私协议》").setClickSpan(ysClickSpan).append("。我们将严格按照上述协议为" +
+        spanUtils.append("欢迎使用秘地！\n").append("在使用我们的产品和服务之前，请您先阅读并了解").append("《用户协议》").setClickSpan(clickSpan).append("和").append("《隐私协议》").setClickSpan(ysClickSpan).append("。我们将严格按照上述协议为" +
                 "您提供服务，保护您的信息安全，点" +
                 "击“同意”即表示您已阅读并同意全部" +
                 "条款，可以继续使用我们的产品和服" +
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/WebViewDialog.java b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/WebViewDialog.java
index d4b9d5c..f978f46 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/WebViewDialog.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/WebViewDialog.java
@@ -4,8 +4,10 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.Color;
+import android.os.Bundle;
 import android.view.Gravity;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 import android.webkit.JavascriptInterface;
@@ -39,12 +41,27 @@ import com.tencent.qcloud.tuikit.tuichat.classicui.page.TUIGroupChatActivity;
 public class WebViewDialog extends BaseDialog<WebViewDialogBinding> {
 
     String mUrl;
+    int type;//10：天空之境 11：岁月之城 12：时空之巅
 
-    public WebViewDialog(@NonNull Context context,String url) {
+    public WebViewDialog(@NonNull Context context, Bundle args) {
         super(context, R.style.BaseDialogStyleH);
-        this.mUrl=url;
+        this.mUrl = args.getString("url");
+        this.type = args.getInt("type");
+        initData1();
+    }
+    @Override
+    public void onStart() {
+        super.onStart();
+        if (getWindow() != null) {
+            // 获取屏幕尺寸
+            android.util.DisplayMetrics displayMetrics = getContext().getResources().getDisplayMetrics();
+            // 设置高度为屏幕高度的80%
+            android.view.WindowManager.LayoutParams params = getWindow().getAttributes();
+            params.height = (int) (displayMetrics.heightPixels * 0.7);
+            params.width = android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+            getWindow().setAttributes(params);
+        }
     }
-
     @Override
     public int getLayoutId() {
         return R.layout.web_view_dialog;
@@ -52,19 +69,34 @@ public class WebViewDialog extends BaseDialog<WebViewDialogBinding> {
 
     @Override
     public void initView() {
-        setCancelable(false);
-        setCanceledOnTouchOutside(false);
+        setCancelable(true);
+        setCanceledOnTouchOutside(true);
         Window window = getWindow();
         assert window != null;
         window.setGravity(Gravity.BOTTOM);
         window.setLayout((int) (ScreenUtils.getScreenWidth() * 320.f / 375), WindowManager.LayoutParams.MATCH_PARENT);
         mBinding.ivClose.setOnClickListener(v -> dismiss());
-//
-    }
 
+        if (type==10){
+            mBinding.gzCl.setBackgroundResource(R.mipmap.tkzj);
+            mBinding.imGz.setImageResource(R.mipmap.tkzj_gz);
+        }else if (type==11){
+            mBinding.gzCl.setBackgroundResource(R.mipmap.syzc);
+            mBinding.imGz.setImageResource(R.mipmap.syzc_gz);
+        }else if (type==12){
+            mBinding.gzCl.setBackgroundResource(R.mipmap.skzj);
+            mBinding.imGz.setImageResource(R.mipmap.skzj_gz);
+        }
+
+    }
 
     @Override
     public void initData() {
+
+    }
+
+
+    public void initData1() {
         WebSettings webSettings = mBinding.webView.getSettings();
         webSettings.setUseWideViewPort(true);
         webSettings.setLoadWithOverviewMode(true);
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryAdapter.java b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryAdapter.java
index 674fc59..fb0db0b 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryAdapter.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryAdapter.java
@@ -47,7 +47,7 @@ public class GiftLotteryAdapter extends BaseQuickAdapter<GiftBean, BaseViewHolde
         helper.setText(R.id.tv_gift_time, item.getCreatetime());
         ImageUtils.loadHeadCC(item.getBase_image(),helper.getView(R.id.iv_gift_image));
         // 使用 SpannableString 给 "x4" 设置不同颜色
-        TextView giftNameTextView = helper.getView(R.id.tv_gift_name);
+        TextView giftNameTextView = helper.getView(R.id.gift_name);
         TextView nickNameTextView = helper.getView(R.id.tv_user_name);
         if (giftNameTextView != null) {
             String baseName = item.getGift_name();
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryContacts.java b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryContacts.java
index 6af6188..207e895 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryContacts.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryContacts.java
@@ -34,5 +34,7 @@ public class GiftLotteryContacts {
         void giftSend(String send_id);
 
         void wallet();
+
+        void xlh(String room_id);
     }
 }
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryDialog.java b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryDialog.java
index 3f6f3b6..11a1389 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryDialog.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryDialog.java
@@ -332,8 +332,13 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
         } else if (id == R.id.sw_tex) {//特效
             isOpenSpecial = mBinding.mirroeSky.swTex.isChecked();
         } else if (id == R.id.tv_gz) {//规则
-            WebViewDialog webViewDialog = new WebViewDialog(getActivity(), getRule_url);
-            webViewDialog.show();
+            Bundle bundle = new Bundle();
+            bundle.putString("url", getRule_url);
+            bundle.putInt("type", type);
+            WebViewDialog dialog = new WebViewDialog(getActivity(), bundle);
+            dialog.show();
+//            WebViewDialog webViewDialog = new WebViewDialog(getActivity(), getRule_url);
+//            webViewDialog.show();
         } else if (id == R.id.tv_jc) {
             if (giftLists != null && !giftLists.isEmpty()) {
                 PrizePoolDialog prizePoolDialog = new PrizePoolDialog(getActivity());
@@ -351,6 +356,8 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
 
             giftLotteryDialogFragment = GiftLotteryDialogFragment.newInstance(giftBagId);
             giftLotteryDialogFragment.show(getChildFragmentManager(), "GiftLotteryDialogFragment");
+        }else if (id == R.id.tv_start){
+
         }
     }
 
@@ -579,6 +586,8 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
     @Override
     public void getGiftListSuccess(BlindBoxBean blindBoxBean) {
         if (blindBoxBean != null && blindBoxBean.getGift_list() != null) {
+
+            upTitle(blindBoxBean.getBox_price());
             giftLists = blindBoxBean.getGift_list();
             getRule_url = blindBoxBean.getRule_url();
             // 确保数据数量不超过视图数量
@@ -616,7 +625,25 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
             }
         }
     }
-    
+
+
+    private void upTitle(int boxPrice){
+        if (type==10){
+            mBinding.mirroeSky.oneTitle.setText(boxPrice+"币一次");
+            mBinding.mirroeSky.tenTitle.setText((boxPrice*10)+"币十次");
+            mBinding.mirroeSky.hundredTitle.setText((boxPrice*100)+"币十次");
+        }else if (type==11){
+            mBinding.cityTime.oneTitle.setText(boxPrice+"币一次");
+            mBinding.cityTime.tenTitle.setText((boxPrice*10)+"币十次");
+            mBinding.cityTime.hundredTitle.setText((boxPrice*100)+"币十次");
+
+        }else if (type==12){
+            mBinding.pinnacleTime.oneTitle.setText(boxPrice+"币一次");
+            mBinding.pinnacleTime.tenTitle.setText((boxPrice*10)+"币十次");
+            mBinding.pinnacleTime.hundredTitle.setText((boxPrice*100)+"币十次");
+        }
+    }
+
     private void UpView(BlindBoxBean.XlhData xlhData) {
         if (xlhData != null) {
 
@@ -739,7 +766,7 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMusicPlay(RoomMessageEvent message) { 
         if (message.getMsgType() == 1056){
-            UpView(message.getText().getXlh_Data());
+            UpView(message.getText().getXlh_data());
         }
     }    
 
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryDialogFragment.java b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryDialogFragment.java
index 302c107..b987696 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryDialogFragment.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryDialogFragment.java
@@ -13,6 +13,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
@@ -39,6 +40,7 @@ public class GiftLotteryDialogFragment extends BaseMvpDialogFragment<GiftLottery
     private String giftBagId;
     private int type=1;
     private GiftLotteryAdapter adapter;
+    private GiftRecordAdapte giftRecordAdapte;
     private List<GiftBean> data=new ArrayList<>();
 
     @Override
@@ -147,16 +149,11 @@ public class GiftLotteryDialogFragment extends BaseMvpDialogFragment<GiftLottery
             columns = 3;
         }
         adapter=new GiftLotteryAdapter();
+        giftRecordAdapte=new GiftRecordAdapte();
+
 //        PagerGridLayoutManager layoutManager = new PagerGridLayoutManager(rows, columns, PagerGridLayoutManager.VERTICAL);
 
-        GridLayoutManager layoutManager = new GridLayoutManager(getActivity(), 3);
-
-        mBinding.recyclerView.setLayoutManager(layoutManager);
-        mBinding.recyclerView.setOnFlingListener(null);
-        // 设置滚动辅助工具
-        PagerGridSnapHelper pageSnapHelper = new PagerGridSnapHelper();
-        pageSnapHelper.attachToRecyclerView(mBinding.recyclerView);
-        mBinding.recyclerView.setAdapter(adapter);
+        dianj(1);
     }
 
     private void onClick(View view) {
@@ -169,10 +166,20 @@ public class GiftLotteryDialogFragment extends BaseMvpDialogFragment<GiftLottery
     }
     public void dianj(int type1){
         if (type1==1) {
+            GridLayoutManager layoutManager = new GridLayoutManager(getActivity(), 3);
+
+            mBinding.recyclerView.setLayoutManager(layoutManager);
+            mBinding.recyclerView.setOnFlingListener(null);
+            // 设置滚动辅助工具
+            PagerGridSnapHelper pageSnapHelper = new PagerGridSnapHelper();
+            pageSnapHelper.attachToRecyclerView(mBinding.recyclerView);
+            mBinding.recyclerView.setAdapter(adapter);
             type=1;
             setTextViewStyle(mBinding.textView2, false);
             setTextViewStyle(mBinding.textView1, true);
         }else if (type1==2){
+            mBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false));
+            mBinding.recyclerView.setAdapter(giftRecordAdapte);
             type=2;
             setTextViewStyle(mBinding.textView2, true);
             setTextViewStyle(mBinding.textView1, false);
@@ -227,15 +234,16 @@ public class GiftLotteryDialogFragment extends BaseMvpDialogFragment<GiftLottery
 
     @Override
     public void getAllRecordSuccess(List<GiftBean> data) {
+
         if (data != null){
             if (page==1){
-                adapter.setNewData(data);
+                giftRecordAdapte.setNewData(data);
             }else {
-                adapter.addData(data);
+                giftRecordAdapte.addData(data);
             }
         }else {
             if (page == 1) {
-                adapter.setNewData(null);
+                giftRecordAdapte.setNewData(null);
             }
         }
     }
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryPresenter.java b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryPresenter.java
index 172732c..3b07e9b 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryPresenter.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryPresenter.java
@@ -125,4 +125,9 @@ public class GiftLotteryPresenter extends BasePresenter<GiftLotteryContacts.View
         });
     }
 
+    @Override
+    public void xlh(String room_id) {
+//        api.xlh(room_id, new BaseObserver<String>() {)
+    }
+
 }
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/PrizePoolDialog.java b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/PrizePoolDialog.java
index fb30e6c..20365b2 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/PrizePoolDialog.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/PrizePoolDialog.java
@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.GridLayoutManager;
 
 import com.xscm.moduleutil.R;
 import com.xscm.moduleutil.adapter.GiftAdapter;
@@ -48,7 +49,7 @@ public class PrizePoolDialog extends BaseDialog<DialogPrizePoolBinding> {
             android.util.DisplayMetrics displayMetrics = getContext().getResources().getDisplayMetrics();
             // 设置高度为屏幕高度的80%
             android.view.WindowManager.LayoutParams params = getWindow().getAttributes();
-            params.height = (int) (displayMetrics.heightPixels * 0.8);
+            params.height = (int) (displayMetrics.heightPixels * 0.7);
             params.width = android.view.ViewGroup.LayoutParams.MATCH_PARENT;
             getWindow().setAttributes(params);
         }
@@ -94,13 +95,13 @@ public class PrizePoolDialog extends BaseDialog<DialogPrizePoolBinding> {
         float density = mContext.getResources().getDisplayMetrics().density;
 
         if (density <= 2.0) { // 低密度屏幕（如mdpi, hdpi）
-            rows = 5;
+            rows = 4;
             columns = 3;
         } else if (density <= 3.0) { // 中密度屏幕（如xhdpi）
-            rows = 5;
+            rows = 4;
             columns = 3;
         } else { // 高密度屏幕（如xxhdpi, xxxhdpi）
-            rows = 5;
+            rows = 4;
             columns = 3;
         }
 
@@ -108,12 +109,13 @@ public class PrizePoolDialog extends BaseDialog<DialogPrizePoolBinding> {
             this.gift_list = newData;
             if (mBinding != null && mContext != null) {
                 PrizePoolAdapter prizePoolAdapter = new PrizePoolAdapter();
-                PagerGridLayoutManager layoutManager = new PagerGridLayoutManager(rows, columns, PagerGridLayoutManager.VERTICAL);
+                GridLayoutManager layoutManager = new GridLayoutManager(getContext(), 3);
+//                PagerGridLayoutManager layoutManager = new PagerGridLayoutManager(rows, columns, PagerGridLayoutManager.VERTICAL);
                 mBinding.gvGift.setLayoutManager(layoutManager);
-                mBinding.gvGift.setOnFlingListener(null);
+//                mBinding.gvGift.setOnFlingListener(null);
                 // 设置滚动辅助工具
-                PagerGridSnapHelper pageSnapHelper = new PagerGridSnapHelper();
-                pageSnapHelper.attachToRecyclerView(mBinding.gvGift);
+//                PagerGridSnapHelper pageSnapHelper = new PagerGridSnapHelper();
+//                pageSnapHelper.attachToRecyclerView(mBinding.gvGift);
                 mBinding.gvGift.setAdapter(prizePoolAdapter);
                 prizePoolAdapter.setNewData(gift_list);
             }
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
new file mode 100644
index 0000000..b19fd96
--- /dev/null
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/TourClubDialogFragment.java
@@ -0,0 +1,78 @@
+package com.xscm.moduleutil.dialog.giftLottery;
+
+import android.view.View;
+
+import com.xscm.moduleutil.R;
+import com.xscm.moduleutil.base.BaseMvpDialogFragment;
+import com.xscm.moduleutil.bean.GiftBean;
+import com.xscm.moduleutil.bean.WalletBean;
+import com.xscm.moduleutil.bean.blindboxwheel.BlindBoxBean;
+import com.xscm.moduleutil.bean.blindboxwheel.BlindReslutBean;
+import com.xscm.moduleutil.databinding.FragmentTourClubDialogBinding;
+
+import java.util.List;
+
+public class TourClubDialogFragment extends BaseMvpDialogFragment<GiftLotteryPresenter, FragmentTourClubDialogBinding> implements GiftLotteryContacts.View {
+    @Override
+    protected GiftLotteryPresenter bindPresenter() {
+        return new GiftLotteryPresenter(this, getActivity());
+    }
+
+    @Override
+    protected void initData() {
+
+    }
+
+    @Override
+    protected void initView() {
+        mBinding.tvJc.setOnClickListener(this::onClick);
+    }
+
+    private void onClick(View view) {
+        int id = view.getId();
+        if (id==R.id.tv_jc){
+//            if (giftLists != null && !giftLists.isEmpty()) {
+//                PrizePoolDialog prizePoolDialog = new PrizePoolDialog(getActivity());
+//                prizePoolDialog.updateData(giftLists, type);
+//                prizePoolDialog.show();
+//            } else {
+//                com.hjq.toast.ToastUtils.show("奖池数据加载中，请稍后再试");
+//            }
+        }
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.fragment_tour_club_dialog;
+    }
+
+    @Override
+    public void getGiftListSuccess(BlindBoxBean blindBoxBean) {
+
+    }
+
+    @Override
+    public void drawGiftListSuccess(BlindReslutBean blindReslutBean) {
+
+    }
+
+    @Override
+    public void getMyRecordSuccess(List<GiftBean> data) {
+
+    }
+
+    @Override
+    public void getAllRecordSuccess(List<GiftBean> data) {
+
+    }
+
+    @Override
+    public void finishRefreshLoadMore() {
+
+    }
+
+    @Override
+    public void wallet(WalletBean walletBean) {
+
+    }
+}
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/XlhObtainDialog.java b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/XlhObtainDialog.java
new file mode 100644
index 0000000..522310f
--- /dev/null
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/XlhObtainDialog.java
@@ -0,0 +1,43 @@
+package com.xscm.moduleutil.dialog.giftLottery;
+
+import android.content.Context;
+import android.view.Window;
+import android.view.WindowManager;
+
+import androidx.annotation.NonNull;
+
+import com.blankj.utilcode.util.ScreenUtils;
+import com.xscm.moduleutil.R;
+import com.xscm.moduleutil.databinding.DialogHeavenGiftBinding;
+import com.xscm.moduleutil.databinding.DialogXlhObtainBinding;
+import com.xscm.moduleutil.widget.dialog.BaseDialog;
+/**
+ *@author qx
+ *@data 2025/9/2
+ *@description: 巡乐会恭喜或得礼弹窗
+ */
+public class XlhObtainDialog extends BaseDialog<DialogXlhObtainBinding> {
+    public XlhObtainDialog(@NonNull Context context) {
+        super(context,R.style.BaseDialogStyleH);
+    }
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.dialog_xlh_obtain;
+    }
+
+    @Override
+    public void initView() {
+        setCancelable(false);
+        setCanceledOnTouchOutside(false);
+        Window window = getWindow();
+        window.setLayout((int) (ScreenUtils.getScreenWidth() * 375.f / 375), WindowManager.LayoutParams.WRAP_CONTENT);
+        mBinding.xlhClose.setOnClickListener(v -> dismiss());
+        mBinding.ivAgain.setOnClickListener(v -> dismiss());///在玩一次
+    }
+
+    @Override
+    public void initData() {
+
+    }
+}
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/event/RoomGiftGiveEvent.java b/moduleUtil/src/main/java/com/xscm/moduleutil/event/RoomGiftGiveEvent.java
index 8e1bb91..4edd042 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/event/RoomGiftGiveEvent.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/event/RoomGiftGiveEvent.java
@@ -15,7 +15,9 @@ public class RoomGiftGiveEvent {
     public RoonGiftModel roonGiftModel;
     public int send_type;
     public String heart_id;
-    public RoomGiftGiveEvent(String userId, String room_id, String pit, String num, int send_type, RoonGiftModel giftModel, RoonGiftModel roonGiftModel,String heart_id){
+    public String auction_id;
+    public RoomGiftGiveEvent(String userId, String room_id, String pit, String num, int send_type,
+                             RoonGiftModel giftModel, RoonGiftModel roonGiftModel,String heart_id,String auction_id){
         this.userId = userId;
         this.room_id = room_id;
         this.pit = pit;
@@ -24,6 +26,7 @@ public class RoomGiftGiveEvent {
         this.giftModel = giftModel;
         this.roonGiftModel = roonGiftModel;
         this.heart_id = heart_id;
+        this.auction_id = auction_id;
     }
 
 
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
index b6ee6d0..15069b5 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
@@ -1432,7 +1432,7 @@ public class RetrofitClient {
                 if (response.code() == 200) {
                     BaseModel<String> baseModel = response.body();
                     if (baseModel.getCode() != 1) {
-                        com.hjq.toast.ToastUtils.show(baseModel.getMsg());
+//                        com.hjq.toast.ToastUtils.show(baseModel.getMsg());
                     }
                 }
             }
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/presenter/BasePresenter.java b/moduleUtil/src/main/java/com/xscm/moduleutil/presenter/BasePresenter.java
index fb983aa..c184da6 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/presenter/BasePresenter.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/presenter/BasePresenter.java
@@ -78,6 +78,9 @@ public abstract class BasePresenter<V extends IView> implements IPresenter {
      * @param disposable
      */
     public void addDisposable(Disposable disposable) {
+        if (mDisposables == null){
+            mDisposables = new CompositeDisposable();
+        }
         mDisposables.add(disposable);
     }
 
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java b/moduleUtil/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java
index bf683db..593373a 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/rtc/AgoraManager.java
@@ -411,7 +411,9 @@ public class AgoraManager {
     @SuppressLint("SuspiciousIndentation")
     public void setLocalAudioEnabled(boolean enabled, String userId) {
         if (rtcEngine != null) {
-            rtcEngine.enableLocalAudio(enabled); // 启用/禁用音频采集
+            if (userId.equals(SpUtil.getUserId()+"")) {
+                rtcEngine.enableLocalAudio(enabled); // 启用/禁用音频采集
+            }
             this.isLocalAudioEnabled = enabled;
             if (!enabled) {
                 for (SoundLevelUpdateListener listener : soundLevelUpdateListeners) {
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/service/MyMqttService.java b/moduleUtil/src/main/java/com/xscm/moduleutil/service/MyMqttService.java
index a0b08fb..bc47f5a 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/service/MyMqttService.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/service/MyMqttService.java
@@ -3,12 +3,15 @@ package com.xscm.moduleutil.service;
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
+import android.app.Service;
 import android.content.Context;
+import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
+import android.os.IBinder;
 import android.os.Looper;
 import android.util.Log;
 
@@ -17,6 +20,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.blankj.utilcode.util.LogUtils;
 import com.orhanobut.logger.Logger;
 import com.xscm.moduleutil.R;
+import com.xscm.moduleutil.bean.XLHBean;
+import com.xscm.moduleutil.event.MqttBean;
 import com.xscm.moduleutil.event.RoomGiftRunable;
 
 import org.eclipse.paho.android.service.MqttAndroidClient;
@@ -28,25 +33,23 @@ import org.eclipse.paho.client.mqttv3.MqttClient;
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
+import org.greenrobot.eventbus.EventBus;
 
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-public class MyMqttService implements MyEmqttConnectListener, MyEmqttMesgListener, MyEmqttSubscribeListener {
+public class MyMqttService extends Service implements MyEmqttConnectListener, MyEmqttMesgListener, MyEmqttSubscribeListener {
 
     private final static String TAG = "lxj";
-
     private static int qos = 2;
-    private static String HOST = "tcp://1.13.181.248";//测试
+//    private static String HOST = "tcp://1.13.181.248";//测试
+    private static String HOST = "tcp://62.234.12.147";//正式
     private static MqttAndroidClient mqttAndroidClient;
     private MqttConnectOptions mMqttConnectOptions;
     private static boolean b = true;
 
-    // 使用单例模式
-    private static MyMqttService instance;
-
     // 使用线程安全的集合存储监听器
     private static final CopyOnWriteArrayList<MyEmqttMesgListener> messageListeners = new CopyOnWriteArrayList<>();
     private static final CopyOnWriteArrayList<MyEmqttConnectListener> connectListeners = new CopyOnWriteArrayList<>();
@@ -67,26 +70,12 @@ public class MyMqttService implements MyEmqttConnectListener, MyEmqttMesgListene
     // 服务状态
     private static boolean isServiceRunning = false;
 
-    private Context mContext;
+    private static final int NOTIFICATION_ID = 1;
+    private static final String CHANNEL_ID = "mqtt_channel";
 
-    // 私有构造函数
-    private MyMqttService(Context context) {
-        this.mContext = context.getApplicationContext();
-        initService();
-    }
-
-    public static MyMqttService getInstance(Context context) {
-        if (instance == null) {
-            synchronized (MyMqttService.class) {
-                if (instance == null) {
-                    instance = new MyMqttService(context);
-                }
-            }
-        }
-        return instance;
-    }
-
-    private void initService() {
+    @Override
+    public void onCreate() {
+        super.onCreate();
         isServiceRunning = true;
 
         // 创建专用的HandlerThread处理MQTT操作
@@ -96,6 +85,10 @@ public class MyMqttService implements MyEmqttConnectListener, MyEmqttMesgListene
 
         // 创建线程池处理消息
         messageExecutorService = Executors.newCachedThreadPool();
+
+        // 启动前台服务
+        startForegroundService();
+
         try {
             init();
         } catch (MqttException e) {
@@ -103,23 +96,39 @@ public class MyMqttService implements MyEmqttConnectListener, MyEmqttMesgListene
         }
     }
 
-    /**
-     * 启动MQTT连接
-     */
-    public void startService() {
-        b = true;
-        if (!isServiceRunning) {
-            initService();
-        }
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        return START_STICKY;
     }
 
-    /**
-     * 停止MQTT服务
-     */
-    public void stopService() {
-        b = false;
-        isServiceRunning = false;
-        cleanup();
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    private void startForegroundService() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            // 创建通知渠道
+            NotificationChannel channel = new NotificationChannel(
+                    CHANNEL_ID,
+                    "MQTT Service",
+                    NotificationManager.IMPORTANCE_LOW
+            );
+            NotificationManager manager = getSystemService(NotificationManager.class);
+            if (manager != null) {
+                manager.createNotificationChannel(channel);
+            }
+
+            // 创建通知
+            Notification notification = new Notification.Builder(this, CHANNEL_ID)
+                    .setContentTitle("消息服务")
+                    .setContentText("正在接收实时消息")
+                    .setSmallIcon(R.mipmap.default_avatar)
+                    .setOngoing(true)
+                    .build();
+
+            startForeground(NOTIFICATION_ID, notification);
+        }
     }
 
     /**
@@ -127,13 +136,13 @@ public class MyMqttService implements MyEmqttConnectListener, MyEmqttMesgListene
      */
     private void init() throws MqttException {
         String CLIENTID = "android-" + MqttClient.generateClientId();
-        mqttAndroidClient = new MqttAndroidClient(mContext, HOST, CLIENTID);
-        mqttAndroidClient.setCallback(mqttCallback); //设置监听订阅消息的回调
+        mqttAndroidClient = new MqttAndroidClient(this, HOST, CLIENTID);
+        mqttAndroidClient.setCallback(mqttCallback);
         mMqttConnectOptions = new MqttConnectOptions();
-        mMqttConnectOptions.setCleanSession(true); //设置是否清除缓存
-        mMqttConnectOptions.setConnectionTimeout(10); //设置超时时间，单位：秒
-        mMqttConnectOptions.setKeepAliveInterval(10); //设置心跳包发送间隔，单位：秒
-        mMqttConnectOptions.setUserName("public"); //设置用户名
+        mMqttConnectOptions.setCleanSession(true);
+        mMqttConnectOptions.setConnectionTimeout(10);
+        mMqttConnectOptions.setKeepAliveInterval(10);
+        mMqttConnectOptions.setUserName("public");
         mMqttConnectOptions.setMqttVersion(MqttConnectOptions.MQTT_VERSION_3_1);
 
         if (mqttAndroidClient != null && !mqttAndroidClient.isConnected()) {
@@ -167,43 +176,19 @@ public class MyMqttService implements MyEmqttConnectListener, MyEmqttMesgListene
                         Log.e(TAG, "MQTT连接异常", e);
                     }
                 }
-            }, 5000); // 5秒后重试
+            }, 5000);
         } else {
             Log.w(TAG, "达到最大重试次数，停止重试");
             retryCount = 0;
         }
     }
 
-    public static void closeConnection() {
-        Handler handler = new Handler(Looper.getMainLooper());
-        handler.post(() -> {
-            try {
-                if (mqttAndroidClient != null && mqttAndroidClient.isConnected()) {
-                    IMqttToken disconnect = mqttAndroidClient.disconnect();
-                    disconnect.setActionCallback(new IMqttActionListener() {
-                        @Override
-                        public void onSuccess(IMqttToken asyncActionToken) {
-                            Logger.e(TAG, "断开链接", "断开链接成功");
-                        }
-
-                        @Override
-                        public void onFailure(IMqttToken asyncActionToken, Throwable exception) {
-                            Logger.e(TAG, "断开链接", "断开链接失败" + exception.getMessage());
-                        }
-                    });
-                }
-            } catch (Exception e) {
-                Log.e(TAG, "关闭连接异常", e);
-            }
-        });
-    }
-
     /**
      * 判断网络是否连接
      */
     private boolean isConnectIsNomarl() {
         try {
-            ConnectivityManager connectivityManager = (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
+            ConnectivityManager connectivityManager = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
             if (connectivityManager != null) {
                 NetworkInfo info = connectivityManager.getActiveNetworkInfo();
                 if (info != null && info.isAvailable()) {
@@ -221,110 +206,11 @@ public class MyMqttService implements MyEmqttConnectListener, MyEmqttMesgListene
         return false;
     }
 
-    /**
-     * 发布 （模拟其他客户端发布消息）
-     *
-     * @param message 消息
-     */
-    public static void publish(String topic, String message) {
-        if (mqttAndroidClient == null) {
-            Logger.e(TAG, "mqttAndroidClient is null", "发送失败");
-            return;
-        }
-
-        // 在后台线程执行发布操作
-        Handler handler = new Handler(Looper.getMainLooper());
-        handler.post(() -> {
-            try {
-                //参数分别为：主题、消息的字节数组、服务质量、是否在服务器保留断开连接后的最后一条消息
-                IMqttDeliveryToken publish = mqttAndroidClient.publish(topic, message.getBytes(), qos, false);
-                publish.setActionCallback(new IMqttActionListener() {
-                    @Override
-                    public void onSuccess(IMqttToken asyncActionToken) {
-                        Logger.e(TAG, "发送消息", "发送成功");
-                    }
-
-                    @Override
-                    public void onFailure(IMqttToken asyncActionToken, Throwable exception) {
-                        Logger.e(TAG, "发送消息", "发送失败: " + exception.getMessage());
-                    }
-                });
-            } catch (Exception e) {
-                Logger.e(TAG, "发送消息", "发送异常: " + e.getMessage());
-            }
-        });
-    }
-
-    public static void subscribe(String topic) {
-        // 在后台线程执行订阅操作
-        Handler handler = new Handler(Looper.getMainLooper());
-        handler.post(() -> {
-            try {
-                if (mqttAndroidClient != null && mqttAndroidClient.isConnected()) {
-                    IMqttToken subToken = mqttAndroidClient.subscribe(topic, qos);
-                    subToken.setActionCallback(new IMqttActionListener() {
-                        @Override
-                        public void onSuccess(IMqttToken asyncActionToken) {
-                            for (MyEmqttSubscribeListener listener : subscribeListeners) {
-                                if (listener != null) {
-                                    listener.onSubscribeSuccess(topic);
-                                }
-                            }
-                            Logger.e(TAG, "订阅成功：" + topic);
-                        }
-
-                        @Override
-                        public void onFailure(IMqttToken asyncActionToken,
-                                              Throwable exception) {
-                            for (MyEmqttSubscribeListener listener : subscribeListeners) {
-                                if (listener != null &&
-                                        !TOPIC_BOSS.equals(topic) &&
-                                        !TOPIC_XLH.equals(topic)) {
-                                    listener.onSubscribeFailure();
-                                }
-                            }
-                            Logger.e(TAG, "订阅失败：" + topic + ", error: " + exception.getMessage());
-                        }
-                    });
-                }
-            } catch (Exception e) {
-                Log.e(TAG, "订阅异常：" + topic, e);
-            }
-        });
-    }
-
-    public static void cleanSubscribe(String topic) {
-        // 在后台线程执行取消订阅操作
-        Handler handler = new Handler(Looper.getMainLooper());
-        handler.post(() -> {
-            try {
-                if (mqttAndroidClient != null && mqttAndroidClient.isConnected()) {
-                    IMqttToken subToken = mqttAndroidClient.unsubscribe(topic);
-                    subToken.setActionCallback(new IMqttActionListener() {
-                        @Override
-                        public void onSuccess(IMqttToken asyncActionToken) {
-                            Logger.e(TAG, "取消成功" + topic);
-                        }
-
-                        @Override
-                        public void onFailure(IMqttToken asyncActionToken,
-                                              Throwable exception) {
-                            Logger.e(TAG, "取消失败" + topic + ", error: " + exception.getMessage());
-                        }
-                    });
-                }
-            } catch (Exception e) {
-                Log.e(TAG, "取消订阅异常：" + topic, e);
-            }
-        });
-    }
-
     //MQTT是否连接成功的监听
     private IMqttActionListener iMqttActionListener = new IMqttActionListener() {
-
         @Override
         public void onSuccess(IMqttToken arg0) {
-            retryCount = 0; // 重置重试计数
+            retryCount = 0;
 
             // 通知所有连接监听器
             for (MyEmqttConnectListener listener : connectListeners) {
@@ -360,7 +246,6 @@ public class MyMqttService implements MyEmqttConnectListener, MyEmqttMesgListene
 
     //订阅主题的回调
     private MqttCallback mqttCallback = new MqttCallback() {
-
         @Override
         public void messageArrived(String topic, MqttMessage message) throws Exception {
             // 将消息处理放到后台线程执行
@@ -369,25 +254,9 @@ public class MyMqttService implements MyEmqttConnectListener, MyEmqttMesgListene
                     String messageStr = message.toString();
                     Logger.e(TAG, "收到的消息", "主题：" + topic + "  收到的消息：" + messageStr);
                     if (topic.equals(TOPIC_BOSS)) {
-                        // 处理消息
-//                        receiveMessage(topic, messageStr);
-//                        new Handler(Looper.getMainLooper()).post(() -> {
-                            receiveMessage(topic, messageStr);
-//                        });
-                        // 通知监听器
-//                        for (MyEmqttMesgListener listener : messageListeners) {
-//                            if (listener != null) {
-//                                // 切换到主线程通知
-////                                new Handler(Looper.getMainLooper()).post(() -> {
-//////                                    listener.messageArrived(topic, messageStr);
-////                                });
-//                            }
-//                        }
+                        receiveMessage(topic, messageStr);
                     } else if (topic.equals(TOPIC_XLH)) {
-//                        receiveXlhMessage(messageStr);
-//                        new Handler(Looper.getMainLooper()).post(() -> {
-                            receiveXlhMessage(messageStr);
-//                        });
+                        receiveXlhMessage(messageStr);
                     }
                 } catch (Exception e) {
                     Log.e(TAG, "处理MQTT消息异常", e);
@@ -426,26 +295,22 @@ public class MyMqttService implements MyEmqttConnectListener, MyEmqttMesgListene
 
     private void receiveXlhMessage(String messageStr) {
         try {
-            String newdata = messageStr;
-            JSONObject jsonObject = JSON.parseObject(newdata);
-
+            JSONObject jsonObject = JSON.parseObject(messageStr);
             int type = jsonObject.getIntValue("type");
             String message = jsonObject.getString("msg");
-
+            XLHBean  xlhBean=JSON.parseObject(message, XLHBean.class);
             // 将事件处理放到主线程执行
             new Handler(Looper.getMainLooper()).post(() -> {
-                processMessageType(type, message);
+//                processMessageType(type, message);
+                EventBus.getDefault().post(xlhBean);
             });
         } catch (Exception e) {
             Log.e(TAG, "解析MQTT消息异常", e);
         }
     }
-
     private void receiveMessage(String topic, String data) {
         try {
-            String newdata = data;
-            JSONObject jsonObject = JSON.parseObject(newdata);
-
+            JSONObject jsonObject = JSON.parseObject(data);
             int type = jsonObject.getIntValue("type");
             String message = jsonObject.getString("msg");
 
@@ -460,155 +325,134 @@ public class MyMqttService implements MyEmqttConnectListener, MyEmqttMesgListene
 
     private void processMessageType(int type, String message) {
         switch (type) {
-            case 3001://抢糖果游戏
-                break;
-            case 5001://延时一秒推送房间-人气变化
-                break;
-            case 5003://延时一秒推送房间-坐骑进场特效
-                break;
-            case 5004://延时一秒推送房间-爵位用户进场特效
-                break;
-            case 5005://推送房间-上麦申请人数变化
-                Logger.e("环信5005", message);
-                break;
-            case 5007://推送房间-用户是否禁言 1禁言2解禁
-                break;
-            case 5011://推送房间-是否封麦 1封麦2解封
-                break;
-            case 5013://推送房间-清空单个麦位心动值
-            case 5014://推送房间-清空所有麦位心动值
-                break;
-            case 5015://推送房间-设置房间管理员
-                break;
-            case 5016://推送房间-删除房间管理员
-                break;
-            case 5017://用户开关麦
-                break;
             case 5019://推送所有人-横幅礼物通知
                 new RoomGiftRunable(message).run();
                 break;
-            case 5020://推送房间-聊天室礼物通知
-                Logger.e("环信5020", message);
-                break;
-            case 5030:
-            case 5021://推送所有人-小猫钓鱼钓到大礼物时通知
-                break;
-            case 5022://推送房间-房间密码变化通知 0取消密码1设置或修改密码
-                break;
-            case 5023://推送房间-房间心动值开关变化通知 1开2关
-                break;
-            case 5024://推送房间-上麦模式变化通知 1自由2排麦
-                break;
-            case 5025://推送房间-修改房间名称
-                break;
-            case 5027://推送房间-周星用户进场特效
-                break;
-            case 5028://推送房间-修改房间背景
-                break;
-            case 5029://推送房间-修改房间公告
-                break;
-            case 5032://推送房间-上麦
-                Logger.e("环信5032", message);
-                break;
-            case 5033://推送房间-下麦
-                Logger.e("环信5033", message);
-                break;
-            case 5034://踢出房间
-                Logger.e("环信5034", message);
-                break;
-            case 5035://推送单独用户-定向推向给上麦的用户
-                break;
-            case 5036://推送房间-用户禁麦 1禁麦2解禁
-                break;
-            case 5037://推送房间-用户进入房间
-                break;
-            case 5038://麦位倒计时
-                break;
-            case 5039://扔骰子
-                break;
-            case 5040://开通守护推送
-                break;
-            case 5041://发送表情
-                break;
-            case 5042://上传即构日志
-                break;
-            case 5043://公屏状态
-                break;
-            case 5044://开球
-                break;
-            case 5045://弃球
-                break;
-            case 5046://亮球
-                break;
-            case 5047://调音
-                break;
-            case 5050://推送
-                break;
-            case 5051://需求变化
-                break;
-            case 5054://房主模式切换
-                break;
-            case 5055://离开房间
-                Logger.e("环信5055", message);
-                break;
-            case 5056://房主加入
-                break;
-            case 5057://房间浇水礼物推送
-                break;
-            case 5058://切换相亲房状态
-                break;
-            case 5059://相亲房礼物动画
-                break;
-            case 5060://房间玫瑰爱神礼物推送
-                break;
-            case 5061://交友房心动值变化
-                Logger.e("环信5061", message);
-                break;
-            case 5062://交友房换麦
-                Logger.e("环信5062", message);
-                break;
-            case 5063://进入小黑屋
-                Logger.e("环信5063", message);
-                break;
-            case 5064://退出小黑屋
-                Logger.e("环信5064", message);
-                break;
-            case 5065://点击开始后进行提示弹框
-                Logger.e("环信5065", message);
-                break;
-            case 5066://cp对数
-                Logger.e("环信5066", message);
-                break;
-            case 5067://延迟时间
-                Logger.e("环信5067", message);
-                break;
-            case 5068://房间内广播
-                Logger.e("环信5068", message);
-                break;
-            case 5069://房间内换麦
-                Logger.e("环信5069", message);
-                break;
-            case 10001: //房间红包
-                break;
-            case 10002: //雨开始
-                break;
-            case 10003: //打开红包
-                break;
-            case 7001: //奖池进度更新
-                break;
-            case 7002://cp时间到
-                Logger.e("环信7002", message);
-                break;
-            case 5070:
-                Logger.e("环信5070", message);
-                break;
         }
     }
 
+    /**
+     * 发布 （模拟其他客户端发布消息）
+     */
+    public static void publish(String topic, String message) {
+        if (mqttAndroidClient == null) {
+            Logger.e(TAG, "mqttAndroidClient is null", "发送失败");
+            return;
+        }
+
+        // 在后台线程执行发布操作
+        new Handler(Looper.getMainLooper()).post(() -> {
+            try {
+                IMqttDeliveryToken publish = mqttAndroidClient.publish(topic, message.getBytes(), qos, false);
+                publish.setActionCallback(new IMqttActionListener() {
+                    @Override
+                    public void onSuccess(IMqttToken asyncActionToken) {
+                        Logger.e(TAG, "发送消息", "发送成功");
+                    }
+
+                    @Override
+                    public void onFailure(IMqttToken asyncActionToken, Throwable exception) {
+                        Logger.e(TAG, "发送消息", "发送失败: " + exception.getMessage());
+                    }
+                });
+            } catch (Exception e) {
+                Logger.e(TAG, "发送消息", "发送异常: " + e.getMessage());
+            }
+        });
+    }
+
+    public static void subscribe(String topic) {
+        // 在后台线程执行订阅操作
+        new Handler(Looper.getMainLooper()).post(() -> {
+            try {
+                if (mqttAndroidClient != null && mqttAndroidClient.isConnected()) {
+                    IMqttToken subToken = mqttAndroidClient.subscribe(topic, qos);
+                    subToken.setActionCallback(new IMqttActionListener() {
+                        @Override
+                        public void onSuccess(IMqttToken asyncActionToken) {
+                            for (MyEmqttSubscribeListener listener : subscribeListeners) {
+                                if (listener != null) {
+                                    listener.onSubscribeSuccess(topic);
+                                }
+                            }
+                            Logger.e(TAG, "订阅成功：" + topic);
+                        }
+
+                        @Override
+                        public void onFailure(IMqttToken asyncActionToken, Throwable exception) {
+                            for (MyEmqttSubscribeListener listener : subscribeListeners) {
+                                if (listener != null &&
+                                        !TOPIC_BOSS.equals(topic) &&
+                                        !TOPIC_XLH.equals(topic)) {
+                                    listener.onSubscribeFailure();
+                                }
+                            }
+                            Logger.e(TAG, "订阅失败：" + topic + ", error: " + exception.getMessage());
+                        }
+                    });
+                }
+            } catch (Exception e) {
+                Log.e(TAG, "订阅异常：" + topic, e);
+            }
+        });
+    }
+
+    public static void cleanSubscribe(String topic) {
+        // 在后台线程执行取消订阅操作
+        new Handler(Looper.getMainLooper()).post(() -> {
+            try {
+                if (mqttAndroidClient != null && mqttAndroidClient.isConnected()) {
+                    IMqttToken subToken = mqttAndroidClient.unsubscribe(topic);
+                    subToken.setActionCallback(new IMqttActionListener() {
+                        @Override
+                        public void onSuccess(IMqttToken asyncActionToken) {
+                            Logger.e(TAG, "取消成功" + topic);
+                        }
+
+                        @Override
+                        public void onFailure(IMqttToken asyncActionToken, Throwable exception) {
+                            Logger.e(TAG, "取消失败" + topic + ", error: " + exception.getMessage());
+                        }
+                    });
+                }
+            } catch (Exception e) {
+                Log.e(TAG, "取消订阅异常：" + topic, e);
+            }
+        });
+    }
+
+    public static void closeConnection() {
+        new Handler(Looper.getMainLooper()).post(() -> {
+            try {
+                if (mqttAndroidClient != null && mqttAndroidClient.isConnected()) {
+                    IMqttToken disconnect = mqttAndroidClient.disconnect();
+                    disconnect.setActionCallback(new IMqttActionListener() {
+                        @Override
+                        public void onSuccess(IMqttToken asyncActionToken) {
+                            Logger.e(TAG, "断开链接", "断开链接成功");
+                        }
+
+                        @Override
+                        public void onFailure(IMqttToken asyncActionToken, Throwable exception) {
+                            Logger.e(TAG, "断开链接", "断开链接失败" + exception.getMessage());
+                        }
+                    });
+                }
+            } catch (Exception e) {
+                Log.e(TAG, "关闭连接异常", e);
+            }
+        });
+    }
+
     /**
      * 清理资源
      */
-    public void cleanup() {
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        b = false;
+        isServiceRunning = false;
+
         try {
             // 清理资源
             if (messageExecutorService != null) {
@@ -630,10 +474,13 @@ public class MyMqttService implements MyEmqttConnectListener, MyEmqttMesgListene
             cleanSubscribe(TOPIC_BOSS);
             cleanSubscribe(TOPIC_XLH);
             if (mqttAndroidClient != null) {
-                mqttAndroidClient.disconnect(); //断开连接
+                mqttAndroidClient.disconnect();
                 mqttAndroidClient.unregisterResources();
                 mqttAndroidClient = null;
             }
+
+            // 停止前台服务
+            stopForeground(true);
             Logger.e(TAG, "服务关闭", "资源释放成功");
         } catch (Exception e) {
             Log.e(TAG, "服务关闭异常", e);
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/MemoryOptimizationUtils.java b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/MemoryOptimizationUtils.java
index 78d21c7..56ac405 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/MemoryOptimizationUtils.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/MemoryOptimizationUtils.java
@@ -4,6 +4,7 @@ import android.content.Context;
 
 import com.blankj.utilcode.util.LogUtils;
 import com.bumptech.glide.Glide;
+import com.orhanobut.logger.Logger;
 
 public class MemoryOptimizationUtils {
     private static final String TAG = "MemoryOptimization";
@@ -22,18 +23,35 @@ public class MemoryOptimizationUtils {
         // 内存使用超过85%认为是低内存
         return memoryUsage > 0.85;
     }
+    private static long lastGCTime = 0;
+    private static final long MIN_GC_INTERVAL = 5000; // 5秒最小间隔
 
     /**
      * 强制进行垃圾回收
      */
     public static void forceGC() {
-        try {
-            LogUtils.d(TAG, "Forcing garbage collection");
-            Runtime.getRuntime().gc();
-            Thread.sleep(100); // 给GC一些时间
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
+        long currentTime = System.currentTimeMillis();
+
+        // 避免频繁调用GC
+        if (currentTime - lastGCTime < MIN_GC_INTERVAL) {
+            Logger.d(TAG, "Skipping GC, too frequent");
+            return;
         }
+
+        lastGCTime = currentTime;
+
+        // 使用异步方式调用GC
+        new Thread(() -> {
+            try {
+                // 在后台线程执行GC
+                System.gc();
+                Thread.sleep(100); // 给GC一些时间
+                Runtime.getRuntime().runFinalization();
+                Logger.d(TAG, "Garbage collection completed");
+            } catch (Exception e) {
+                Logger.e(TAG, "Error during GC: " + e.getMessage());
+            }
+        }).start();
     }
 
     /**
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java
index afc09fb..273117c 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentEnum.java
@@ -2,18 +2,18 @@ package com.xscm.moduleutil.utils.config;
 
 public enum EnvironmentEnum {
     PRODUCTION(//生产环境
-            "http://chat.qxmier.com/",
-            "6rdWuz058oq5OahdbFiGEybUcdahd12J83L34Uc7MrPIrxtFG+rXiwDvRcqNvjwbClbbmvMrmxKVkIysFByBsl0Qe9kqd2w8T/nhK5G6eXXlk2V9AjYCieIU+jRnjZBB+Cfechr6rCGJ2aeBARIsXcRPW7wm9WFK9euh5T+v6Pyte68yNaNdcYCll3+U4/uCEog7HygCnMIbAU+kqoPdmn2H+51YOHW+VsnsHd4w1+I3f8Tt0xLIXGM4GWnQueZ5GR46GTWiSYMy8dCIh9SPIMRyC91GosVcfGPMJSdcXqc=",
-            "https://oss-cn-hangzhou.aliyuncs.com/",
-            "LTAI5tJ2UYfFNF7K3F4e1siv",
-            "DhpCS82gaigZljYqsWsUWUAZ20dREz",
-            "qx-yusheng",
-            "https://qx-yusheng.oss-cn-hangzhou.aliyuncs.com/",
-            "wxc7681513be9f926b",
+            "http://md.xscmmidi.site/",
+            "yIZtKT0bz5hhD3wb30p+n5+qoasPj0XGza1qRuYXhtm9nFJdf1fA5B4tB6MjGRQNrCIAmlRMiiUP2DhjsDcih9Szx8HmZADuwCI0YTnva6kibqgbuYOtU2zeem3phkbZe27vbZ94aCWAZulloMeXuAFHd0jSaCBxNctKTYLjGQUGnDt/IDQr6mvLHSbb19X9vgQBa2gsTHjt3HYh2EY7dRJA020SPDe35hKf54v826Vgd34isc+BERQ7dwSH0NJ16OqFP181nlGRZvFFbuab3mweFyDOXQTpuN4NbixO5QQ=",
+            "https://oss-cn-beijing.aliyuncs.com/",
+            "LTAI5tKgrfcFQxH46ZwWYgFW",
+            "ZOjTqAJmUL563EKFKySrUwAHtx4hKt",
+            "midi01",
+            "https://midi01.oss-cn-beijing.aliyuncs.com/",
+            "wxef1289d8a89b41d4",
             1600101474,
-            "4a521d6f1c6343998b1c8fd425dea02a",
+            "a3f0f0c78307434fa1c697c3429fbdcf",
             "tcp://81.70.45.221",
-            "https://vespa.qxmier.com"),
+            "https://mdh.xscmmidi.site"),
     TEST(//测试环境
             "http://md.qxmier.com/",
             "6rdWuz058oq5OahdbFiGEybUcdahd12J83L34Uc7MrPIrxtFG+rXiwDvRcqNvjwbClbbmvMrmxKVkIysFByBsl0Qe9kqd2w8T/nhK5G6eXXlk2V9AjYCieIU+jRnjZBB+Cfechr6rCGJ2aeBARIsXcRPW7wm9WFK9euh5T+v6Pyte68yNaNdcYCll3+U4/uCEog7HygCnMIbAU+kqoPdmn2H+51YOHW+VsnsHd4w1+I3f8Tt0xLIXGM4GWnQueZ5GR46GTWiSYMy8dCIh9SPIMRyC91GosVcfGPMJSdcXqc=",
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentPrefs.java b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentPrefs.java
index 43c35bc..4e232b9 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentPrefs.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/utils/config/EnvironmentPrefs.java
@@ -27,11 +27,11 @@ public class EnvironmentPrefs {
 
     // 获取当前选择的环境，默认为 PRODUCTION
     public EnvironmentEnum getSelectedEnvironment() {
-        String envName = sharedPreferences.getString(KEY_ENV, EnvironmentEnum.TEST.name());
+        String envName = sharedPreferences.getString(KEY_ENV, EnvironmentEnum.PRODUCTION.name());
         try {
             return EnvironmentEnum.valueOf(envName);
         } catch (IllegalArgumentException e) {
-            return EnvironmentEnum.TEST; // 出错时默认返回生产环境
+            return EnvironmentEnum.PRODUCTION; // 出错时默认返回生产环境
         }
     }
 }
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/AvatarFrameView.java b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/AvatarFrameView.java
index 253f764..353c0a2 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/AvatarFrameView.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/AvatarFrameView.java
@@ -22,6 +22,7 @@ import androidx.databinding.DataBindingUtil;
 
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.PathUtils;
+import com.blankj.utilcode.util.ThreadUtils;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.ui.PlayerView;
@@ -299,10 +300,42 @@ public class AvatarFrameView extends FrameLayout implements IAnimListener {
             clearQueue();
             return;
         }
+        // 异步处理URL解析等耗时操作
+        ThreadUtils.executeByIo(new ThreadUtils.SimpleTask<String>() {
+            @Override
+            public String doInBackground() throws Throwable {
+                // 在后台线程进行URL有效性检查或其他预处理
+                if (url == null || url.isEmpty()) {
+                    return null;
+                }
+                return url; // 返回处理后的URL
+            }
 
+            @Override
+            public void onSuccess(String processedUrl) {
+                if (processedUrl != null) {
+                    // 使用post方法确保在下一个UI循环中执行
+                    mainHandler.post(() -> {
+                        // 再次检查状态
+                        if (!isDestroyed && !isPlaying) {
+                            playQueue.add(new PlayItem(processedUrl, type2));
+                            checkAndStartPlayback();
+                        } else {
+                            // 如果正在播放，添加到队列中
+                            playQueue.add(new PlayItem(processedUrl, type2));
+                        }
+                    });
+                }
+            }
+
+            @Override
+            public void onFail(Throwable e) {
+                LogUtils.e("Error processing gift URL: " + e.getMessage());
+            }
+        });
         // 添加到播放队列
 //        playQueue.offer(new PlayItem(url, type2));
-        playQueue.add(new PlayItem(url, type2));
+//        playQueue.add(new PlayItem(url, type2));
         Logger.d("AvatarFrameView", "Added to queue, queue size: " + playQueue.size() + ", url: " + url);
 
         // 如果当前没有在播放，则开始播放
@@ -310,7 +343,7 @@ public class AvatarFrameView extends FrameLayout implements IAnimListener {
 //            playNextFromQueue();
 //        }
         // 改进播放检查逻辑
-        checkAndStartPlayback();
+//        checkAndStartPlayback();
     }
 
 
@@ -829,43 +862,113 @@ public class AvatarFrameView extends FrameLayout implements IAnimListener {
     private void releaseResources() {
         LogUtils.d(TAG, "Releasing all resources");
 
-//        if (isDestroyed) return;
+        if (isDestroyed) return;
+// 使用异步线程处理耗时操作
+        new Thread(() -> {
+            try {
+                // 在后台线程处理文件操作和大对象清理
+                performHeavyCleanup();
 
-        try {
-            // 清理 SVGA 资源
-            if (svgaSurface != null && svgaSurface.getDrawable() instanceof SVGADrawable) {
-                SVGADrawable drawable = (SVGADrawable) svgaSurface.getDrawable();
-                if (drawable != null) {
-                    try {
-                        drawable.stop();
-                        svgaSurface.clearAnimation();
-                        svgaSurface.setImageDrawable(null);
-                    } catch (Exception e) {
-                        LogUtils.e(TAG, "Error releasing SVGA resources: " + e.getMessage());
-                    }
-                }
+                // 回到主线程处理 UI 相关的清理
+                mainHandler.post(() -> {
+                    performUICleanup();
+                });
+            } catch (Exception e) {
+                Logger.e(TAG, "Error in async releaseResources: " + e.getMessage());
+                // 出错时仍在主线程清理 UI 资源
+                mainHandler.post(() -> {
+                    performUICleanup();
+                });
             }
+        }).start();
 
+
+//        try {
+//            // 清理 SVGA 资源
+//            if (svgaSurface != null && svgaSurface.getDrawable() instanceof SVGADrawable) {
+//                SVGADrawable drawable = (SVGADrawable) svgaSurface.getDrawable();
+//                if (drawable != null) {
+//                    try {
+//                        drawable.stop();
+//                        svgaSurface.clearAnimation();
+//                        svgaSurface.setImageDrawable(null);
+//                    } catch (Exception e) {
+//                        LogUtils.e(TAG, "Error releasing SVGA resources: " + e.getMessage());
+//                    }
+//                }
+//            }
+//
+//            // 停止并清理播放器
+//            if (mBinding != null && mBinding.playView != null) {
+//                mBinding.playView.stopPlay();
+//            }
+//
+//            // 清理 ExoPlayer 资源
+//            if (exoPlayer != null) {
+//                try {
+//                    exoPlayer.stop();
+//                    exoPlayer.clearVideoSurface();
+//                } catch (Exception e) {
+//                    LogUtils.e(TAG, "Error releasing ExoPlayer resources: " + e.getMessage());
+//                }
+//            }
+//        } catch (Exception e) {
+//            LogUtils.e(TAG, "Error in releaseResources: " + e.getMessage());
+//        }
+    }
+    /**
+     * 在后台线程执行耗时的清理操作
+     */
+    private void performHeavyCleanup() {
+        try {
+            // 清理缓存文件（如果需要）
+            // 清理大对象引用等
+//            clearCacheFiles();
+        } catch (Exception e) {
+            Logger.e(TAG, "Error in performHeavyCleanup: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 在主线程执行 UI 相关的清理操作
+     */
+    private void performUICleanup() {
+        try {
             // 停止并清理播放器
             if (mBinding != null && mBinding.playView != null) {
-                mBinding.playView.stopPlay();
+                try {
+                    mBinding.playView.stopPlay();
+                } catch (Exception e) {
+                    Logger.e(TAG, "Error stopping playView: " + e.getMessage());
+                }
             }
 
             // 清理 ExoPlayer 资源
             if (exoPlayer != null) {
                 try {
+                    // 使用异步停止避免阻塞
                     exoPlayer.stop();
                     exoPlayer.clearVideoSurface();
                 } catch (Exception e) {
-                    LogUtils.e(TAG, "Error releasing ExoPlayer resources: " + e.getMessage());
+                    Logger.e(TAG, "Error releasing ExoPlayer resources: " + e.getMessage());
+                }
+            }
+
+            // 清理 SVGA 资源
+            if (svgaSurface != null) {
+                try {
+                    svgaSurface.pauseAnimation();
+                    svgaSurface.clearAnimation();
+                    svgaSurface.setImageDrawable(null);
+                } catch (Exception e) {
+                    Logger.e(TAG, "Error releasing SVGA resources: " + e.getMessage());
                 }
             }
         } catch (Exception e) {
-            LogUtils.e(TAG, "Error in releaseResources: " + e.getMessage());
+            Logger.e(TAG, "Error in performUICleanup: " + e.getMessage());
         }
     }
 
-
     /**
      * 公共释放方法，用于外部主动释放资源
      */
@@ -877,7 +980,7 @@ public class AvatarFrameView extends FrameLayout implements IAnimListener {
             mainHandler.post(this::release);
             return;
         }
-//        isDestroyed = true;
+        isDestroyed = true;
 
         try {
             // 清空播放队列
@@ -886,26 +989,36 @@ public class AvatarFrameView extends FrameLayout implements IAnimListener {
             // 释放所有资源
             releaseResources();
 
-            // 释放 ExoPlayer
-            if (exoPlayer != null) {
-                try {
-                    exoPlayer.stop();
-                    exoPlayer.release();
-                } catch (Exception e) {
-                    LogUtils.e(TAG, "Error releasing ExoPlayer: " + e.getMessage());
+            // 延迟清理 ExoPlayer（避免主线程阻塞）
+            mainHandler.postDelayed(() -> {
+                if (exoPlayer != null) {
+                    try {
+                        exoPlayer.release();
+                    } catch (Exception e) {
+                        Logger.e(TAG, "Error releasing ExoPlayer: " + e.getMessage());
+                    }
+                    exoPlayer = null;
                 }
-                exoPlayer = null;
-            }
+            }, 50);
 
-            // 清理 PlayerView
-            if (playerView != null) {
-                try {
-                    playerView.setPlayer(null);
-                } catch (Exception e) {
-                    LogUtils.e(TAG, "Error releasing PlayerView: " + e.getMessage());
+            // 延迟清理其他资源
+            mainHandler.postDelayed(() -> {
+                // 清理 PlayerView
+                if (playerView != null) {
+                    try {
+                        playerView.setPlayer(null);
+                    } catch (Exception e) {
+                        Logger.e(TAG, "Error releasing PlayerView: " + e.getMessage());
+                    }
+                    playerView = null;
                 }
-                playerView = null;
-            }
+
+                // 清理 binding
+                if (mBinding != null) {
+                    mBinding = null;
+                }
+            }, 100);
+
 
             // 清理 SVGAImageView
             if (svgaSurface != null) {
@@ -931,7 +1044,7 @@ public class AvatarFrameView extends FrameLayout implements IAnimListener {
             LogUtils.e(TAG, "Error in AvatarFrameView release: " + e.getMessage());
         } finally {
             // 建议进行垃圾回收
-            MemoryOptimizationUtils.forceGC();
+//            MemoryOptimizationUtils.forceGC();
         }
     }
     public void clearQueue() {
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java
index dfabb75..de0cd49 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java
@@ -351,17 +351,15 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
 //    @Subscribe(threadMode = ThreadMode.MAIN)
 
     public void setOnlineStatus(UserOnlineStatusBean isOnline) {
-//        iv_on_line.setVisibility(isOnline ? GONE : VISIBLE);
-
-        if (pitBean.getUser_id() != null && !pitBean.getUser_id().equals("0") && !pitBean.getUser_id().isEmpty()) {
-////            for (UserOnlineStatusBean userOnlineStatus : userOnlineStatusBean) {
-            if (pitBean.getUser_id().equals(isOnline.getUser_id())) {
-                if (isOnline.getIs_online() == 1) {
-                    iv_on_line.setVisibility(GONE);
-                } else {
-                    iv_on_line.setVisibility(VISIBLE);
+        if (pitBean!=null) {
+            if (pitBean.getUser_id() != null && !pitBean.getUser_id().equals("0") && !pitBean.getUser_id().isEmpty()) {
+                if (pitBean.getUser_id().equals(isOnline.getUser_id())) {
+                    if (isOnline.getIs_online() == 1) {
+                        iv_on_line.setVisibility(GONE);
+                    } else {
+                        iv_on_line.setVisibility(VISIBLE);
+                    }
                 }
-////                }
             }
         }
     }
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/PiaoPingManager.java b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/PiaoPingManager.java
index b3f2d4d..5161fce 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/PiaoPingManager.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/PiaoPingManager.java
@@ -5,20 +5,25 @@ import static com.liulishuo.okdownload.OkDownloadProvider.context;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.WindowManager;
 import android.view.animation.DecelerateInterpolator;
 import android.widget.FrameLayout;
+import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.blankj.utilcode.util.LogUtils;
 import com.petterp.floatingx.FloatingX;
 import com.petterp.floatingx.assist.FxGravity;
 import com.petterp.floatingx.assist.helper.FxAppHelper;
 import com.xscm.moduleutil.R;
+import com.xscm.moduleutil.bean.XLHBean;
 import com.xscm.moduleutil.event.MqttBean;
+import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.ImageUtils;
 
 import org.greenrobot.eventbus.EventBus;
@@ -39,7 +44,9 @@ public class PiaoPingManager {
     private View piaoPingView;
     private boolean isPiaoPingShown = false;
     private Queue<MqttBean> messageQueue = new ConcurrentLinkedQueue<>(); // 消息队列
+    private Queue<XLHBean> XLHmessageQueue = new ConcurrentLinkedQueue<>(); // 消息队列
     private boolean isAnimating = false; // 动画状态标记
+    private boolean XLHisAnimating = false; // 动画状态标记
     private PiaoPingManager(Context context) {
         windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
         if (windowManager == null) return;
@@ -155,6 +162,8 @@ public class PiaoPingManager {
         }
         messageQueue.clear();
         isAnimating = false; // 重置动画状态
+        XLHmessageQueue.clear();
+        XLHisAnimating = false;
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
@@ -164,5 +173,103 @@ public class PiaoPingManager {
 //        FxAppHelper fxAppHelper = FxAppHelper.builder().setContext( context).setLayout(R.layout.item_piaoping).build();
 //        FloatingX.install(fxAppHelper).show();
     }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEvent(XLHBean event) {
+        showPiaoPingMessageXlh(event);
+    }
+
+    private void showPiaoPingMessageXlh(XLHBean event) {
+        // 创建 FloatingX 配置
+        // 添加到队列
+        XLHmessageQueue.offer(event);
+        // 如果当前没有动画正在进行，则开始处理
+        if (!XLHisAnimating) {
+            processNextMessageXlh();
+        }
+    }
+
+    private void processNextMessageXlh() {
+        if (XLHmessageQueue.isEmpty()) {
+            XLHisAnimating = false;
+            return;
+        }
+
+        XLHisAnimating = true;
+        XLHBean xlhBean = XLHmessageQueue.poll();
+        displayMessageXlh(xlhBean);
+    }
+    @SuppressLint({"MissingInflatedId", "LocalSuppress"})
+    private void displayMessageXlh(XLHBean xlhBean) {
+        // 获取悬浮窗视图并设置内容
+        View floatingView = LayoutInflater.from(context).inflate(R.layout.item_piaoping_xlh, new FrameLayout(context), false);
+        TextView textView = floatingView.findViewById(R.id.tv_name);
+        ImageView xlh_image = floatingView.findViewById(R.id.im_xlh);
+//        if (xlhBean.getFrom_type() == 1){
+//            xlh_image.setImageResource(R.mipmap.xlh_jjks);
+//        }else {
+//            xlh_image.setImageResource(R.mipmap.xlh_zsks);
+//        }
+
+        xlh_image.setImageDrawable(xlhBean.getFrom_type() == 1 ? context.getResources().getDrawable(R.mipmap.xlh_jjks) : context.getResources().getDrawable(R.mipmap.xlh_zsks));
+
+        textView.setText(xlhBean.getText());
+
+        // 先将视图放置在屏幕右侧外部，避免闪现问题
+        floatingView.setTranslationX(10000); // 先放到屏幕外
+
+        FxAppHelper fxAppHelper = FxAppHelper.builder()
+                .setContext(context)
+                .setLayoutView(floatingView)
+                .setGravity(FxGravity.RIGHT_OR_TOP)
+                .setX(0)
+                .setY(100)
+                .build();
+
+        FloatingX.install(fxAppHelper).show();
+// 添加点击事件监听器
+        floatingView.setOnClickListener(v -> {
+            // 点击时执行跳转操作
+            handleItemClick(xlhBean);
+        });
+        // 首先从右侧滑入到屏幕中央
+        floatingView.post(() -> {
+            // 确保初始位置在屏幕右侧外部
+            floatingView.setTranslationX(floatingView.getWidth());
+
+            // 第一阶段：从右到屏幕右侧边缘（缓慢进入）
+            ObjectAnimator animator1 = ObjectAnimator.ofFloat(floatingView, "translationX",
+                    floatingView.getWidth(), 0f);
+            animator1.setDuration(1500); // 延长动画时间到1.5秒
+            animator1.setInterpolator(new DecelerateInterpolator(2.0f)); // 更平缓的减速效果
+            animator1.start();
+
+            // 第二阶段：延迟1秒后从当前位置向左滑出
+            floatingView.postDelayed(() -> {
+                ObjectAnimator animator2 = ObjectAnimator.ofFloat(floatingView, "translationX",
+                        0f, -floatingView.getWidth());
+                animator2.setDuration(1500); // 延长动画时间到1.5秒
+                animator2.setInterpolator(new DecelerateInterpolator(2.0f)); // 更平缓的减速效果
+                animator2.addListener(new AnimatorListenerAdapter() {
+                    @Override
+                    public void onAnimationEnd(Animator animation) {
+                        // 动画结束后移除悬浮窗
+                        FloatingX.uninstallAll();
+                        // 处理下一个消息
+                        processNextMessageXlh();
+                    }
+                });
+                animator2.start();
+            }, 4000); // 停留1秒
+        });
+    }
+
+    private void handleItemClick(XLHBean xlhBean) {
+        // 这里可以根据实际需求实现跳转逻辑
+        // 例如：跳转到礼物详情页面、用户主页等
+
+        ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("from", "我的界面").withString("roomId", xlhBean.getRoom_id()).navigation();
+
+    }
 }
 
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomMakeWheatView.java b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomMakeWheatView.java
index ad0597a..7dafd78 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomMakeWheatView.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomMakeWheatView.java
@@ -71,7 +71,7 @@ public class RoomMakeWheatView extends BaseWheatView {
             mIvRipple.stopAnimation();
             mIvRipple.setVisibility(VISIBLE);
             mTvName.setText(bean.getNickname());
-            ImageUtils.loadCenterCrop(bean.getAvatar(), mRiv);
+            ImageUtils.loadHeadCC(bean.getAvatar(), mRiv);
             if (TextUtils.isEmpty(pitBean.getDress_picture())) {
                 mIvFrame.setVisibility(INVISIBLE);
             } else {
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java
index a468394..e34b250 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java
@@ -23,7 +23,7 @@ public class RoomSingSongWheatView extends BaseWheatView {
     public ImageView mIvTagBoss;
     public TextView mTvTime;
     public TextView tv_time_pk;
-
+    public boolean isClickListenerSet = false;
     private boolean showBoss;//显示老板标识
 
     public RoomSingSongWheatView(Context context) {
diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/WheatLayoutManager.java b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/WheatLayoutManager.java
index 0c6f655..261b6bc 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/WheatLayoutManager.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/WheatLayoutManager.java
@@ -227,6 +227,7 @@ public class WheatLayoutManager {
         return metrics.widthPixels;
     }
 
+
     public void updateSingleWheat(RoomPitBean pitBean, int pitNumber) {
         if (pitList == null || pitList.isEmpty() || pitNumber < 1 || pitNumber > 10) return;
         if (isSingleMode && this.currentSinglePit != pitNumber) return;
diff --git a/moduleUtil/src/main/res/drawable/bg_r4_eff2f8.xml b/moduleUtil/src/main/res/drawable/bg_r4_eff2f8.xml
index 6dff1a2..d16b5c8 100644
--- a/moduleUtil/src/main/res/drawable/bg_r4_eff2f8.xml
+++ b/moduleUtil/src/main/res/drawable/bg_r4_eff2f8.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="true">
         <shape android:shape="rectangle">
-            <solid android:color="#FFFF00" />
+            <solid android:color="#6C49E4" />
             <corners android:radius="8dp" />
         </shape>
     </item>
diff --git a/moduleUtil/src/main/res/layout/dialog_city_time.xml b/moduleUtil/src/main/res/layout/dialog_city_time.xml
index 477304d..ade7784 100644
--- a/moduleUtil/src/main/res/layout/dialog_city_time.xml
+++ b/moduleUtil/src/main/res/layout/dialog_city_time.xml
@@ -38,12 +38,13 @@
                     android:textSize="@dimen/sp_12" />
 
                 <TextView
+                    android:id="@+id/one_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/dp_2"
                     android:drawableLeft="@mipmap/jinb"
                     android:gravity="center"
-                    android:text="10币一次"
+                    tools:text="10币一次"
                     android:textSize="@dimen/sp_10" />
             </LinearLayout>
 
@@ -68,12 +69,13 @@
                     android:textSize="@dimen/sp_12" />
 
                 <TextView
+                    android:id="@+id/ten_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/dp_2"
                     android:drawableLeft="@mipmap/jinb"
                     android:gravity="center"
-                    android:text="100币一次"
+                    tools:text="100币一次"
                     android:textSize="@dimen/sp_10" />
             </LinearLayout>
 
@@ -96,12 +98,13 @@
                     android:textSize="@dimen/sp_12" />
 
                 <TextView
+                    android:id="@+id/hundred_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/dp_2"
                     android:drawableLeft="@mipmap/jinb"
                     android:gravity="center"
-                    android:text="1000币一次"
+                    tools:text="1000币一次"
                     android:textSize="@dimen/sp_10" />
             </LinearLayout>
         </LinearLayout>
@@ -148,14 +151,14 @@
             android:id="@+id/ll_yx"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_60"
-            android:layout_marginBottom="@dimen/dp_17"
+            android:layout_marginEnd="@dimen/dp_10"
+            android:layout_marginBottom="5dp"
             android:gravity="center"
             android:orientation="horizontal"
             app:layout_constraintBottom_toTopOf="@+id/lottery_buttons_layout"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/gift7">
+            app:layout_constraintEnd_toStartOf="@+id/ll_tx"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="parent">
 
 
             <TextView
@@ -170,12 +173,12 @@
 
             <Switch
                 android:id="@+id/sw_lock_yx"
+                tools:ignore="UseSwitchCompatOrMaterialXml"
                 android:layout_width="@dimen/dp_37"
                 android:layout_height="@dimen/dp_20"
                 android:layout_marginStart="@dimen/dp_5"
                 android:background="@drawable/room_tuner_selector_switch"
-                android:thumb="@android:color/transparent"
-                tools:ignore="UseSwitchCompatOrMaterialXml" />
+                android:thumb="@android:color/transparent" />
 
 
         </LinearLayout>
@@ -184,12 +187,13 @@
             android:id="@+id/ll_tx"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_20"
-            android:layout_marginBottom="@dimen/dp_17"
+            android:layout_marginStart="@dimen/dp_10"
+            android:layout_marginBottom="@dimen/dp_5"
             android:gravity="center"
             android:orientation="horizontal"
-            app:layout_constraintStart_toEndOf="@+id/ll_yx"
-            app:layout_constraintTop_toTopOf="@+id/ll_yx">
+            app:layout_constraintBottom_toTopOf="@+id/lottery_buttons_layout"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/ll_yx">
 
 
             <TextView
@@ -204,12 +208,12 @@
 
             <Switch
                 android:id="@+id/sw_tex"
+                tools:ignore="UseSwitchCompatOrMaterialXml"
                 android:layout_width="@dimen/dp_37"
                 android:layout_height="@dimen/dp_20"
                 android:layout_marginStart="@dimen/dp_5"
                 android:background="@drawable/room_tuner_selector_switch"
-                android:thumb="@android:color/transparent"
-                tools:ignore="UseSwitchCompatOrMaterialXml" />
+                android:thumb="@android:color/transparent" />
 
         </LinearLayout>
 
diff --git a/moduleUtil/src/main/res/layout/dialog_mirroe_sky.xml b/moduleUtil/src/main/res/layout/dialog_mirroe_sky.xml
index b8b28d6..a454a30 100644
--- a/moduleUtil/src/main/res/layout/dialog_mirroe_sky.xml
+++ b/moduleUtil/src/main/res/layout/dialog_mirroe_sky.xml
@@ -38,12 +38,13 @@
                     android:textSize="@dimen/sp_12" />
 
                 <TextView
+                    android:id="@+id/one_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/dp_2"
                     android:drawableLeft="@mipmap/jinb"
                     android:gravity="center"
-                    android:text="10币一次"
+                    tools:text="10币一次"
                     android:textSize="@dimen/sp_10" />
             </LinearLayout>
 
@@ -68,12 +69,13 @@
                     android:textSize="@dimen/sp_12" />
 
                 <TextView
+                    android:id="@+id/ten_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/dp_2"
                     android:drawableLeft="@mipmap/jinb"
                     android:gravity="center"
-                    android:text="100币一次"
+                    tools:text="100币一次"
                     android:textSize="@dimen/sp_10" />
             </LinearLayout>
 
@@ -96,12 +98,13 @@
                     android:textSize="@dimen/sp_12" />
 
                 <TextView
+                    android:id="@+id/hundred_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/dp_2"
                     android:drawableLeft="@mipmap/jinb"
                     android:gravity="center"
-                    android:text="1000币一次"
+                    tools:text="1000币一次"
                     android:textSize="@dimen/sp_10" />
             </LinearLayout>
         </LinearLayout>
@@ -148,14 +151,14 @@
             android:id="@+id/ll_yx"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_60"
-            android:layout_marginBottom="@dimen/dp_17"
+            android:layout_marginEnd="@dimen/dp_10"
+            android:layout_marginBottom="5dp"
             android:gravity="center"
             android:orientation="horizontal"
             app:layout_constraintBottom_toTopOf="@+id/lottery_buttons_layout"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/gift10">
+            app:layout_constraintEnd_toStartOf="@+id/ll_tx"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="parent">
 
 
             <TextView
@@ -184,12 +187,13 @@
             android:id="@+id/ll_tx"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_20"
-            android:layout_marginBottom="@dimen/dp_17"
+            android:layout_marginStart="@dimen/dp_10"
+            android:layout_marginBottom="@dimen/dp_5"
             android:gravity="center"
             android:orientation="horizontal"
-            app:layout_constraintStart_toEndOf="@+id/ll_yx"
-            app:layout_constraintTop_toTopOf="@+id/ll_yx">
+            app:layout_constraintBottom_toTopOf="@+id/lottery_buttons_layout"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/ll_yx">
 
 
             <TextView
diff --git a/moduleUtil/src/main/res/layout/dialog_pinnacle_time.xml b/moduleUtil/src/main/res/layout/dialog_pinnacle_time.xml
index a541455..7f5acf0 100644
--- a/moduleUtil/src/main/res/layout/dialog_pinnacle_time.xml
+++ b/moduleUtil/src/main/res/layout/dialog_pinnacle_time.xml
@@ -38,12 +38,13 @@
                     android:textSize="@dimen/sp_12" />
 
                 <TextView
+                    android:id="@+id/one_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/dp_2"
                     android:drawableLeft="@mipmap/jinb"
                     android:gravity="center"
-                    android:text="10币一次"
+                    tools:text="10币一次"
                     android:textSize="@dimen/sp_10" />
             </LinearLayout>
 
@@ -68,12 +69,13 @@
                     android:textSize="@dimen/sp_12" />
 
                 <TextView
+                    android:id="@+id/ten_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/dp_2"
                     android:drawableLeft="@mipmap/jinb"
                     android:gravity="center"
-                    android:text="100币一次"
+                    tools:text="100币一次"
                     android:textSize="@dimen/sp_10" />
             </LinearLayout>
 
@@ -96,12 +98,13 @@
                     android:textSize="@dimen/sp_12" />
 
                 <TextView
+                    android:id="@+id/hundred_title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/dp_2"
                     android:drawableLeft="@mipmap/jinb"
                     android:gravity="center"
-                    android:text="1000币一次"
+                    tools:text="1000币一次"
                     android:textSize="@dimen/sp_10" />
             </LinearLayout>
         </LinearLayout>
@@ -148,14 +151,14 @@
             android:id="@+id/ll_yx"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_60"
-            android:layout_marginBottom="@dimen/dp_17"
+            android:layout_marginEnd="@dimen/dp_10"
+            android:layout_marginBottom="5dp"
             android:gravity="center"
             android:orientation="horizontal"
             app:layout_constraintBottom_toTopOf="@+id/lottery_buttons_layout"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/gift7">
+            app:layout_constraintEnd_toStartOf="@+id/ll_tx"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="parent">
 
 
             <TextView
@@ -170,12 +173,12 @@
 
             <Switch
                 android:id="@+id/sw_lock_yx"
+                tools:ignore="UseSwitchCompatOrMaterialXml"
                 android:layout_width="@dimen/dp_37"
                 android:layout_height="@dimen/dp_20"
                 android:layout_marginStart="@dimen/dp_5"
                 android:background="@drawable/room_tuner_selector_switch"
-                android:thumb="@android:color/transparent"
-                tools:ignore="UseSwitchCompatOrMaterialXml" />
+                android:thumb="@android:color/transparent" />
 
 
         </LinearLayout>
@@ -184,12 +187,13 @@
             android:id="@+id/ll_tx"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_20"
-            android:layout_marginBottom="@dimen/dp_17"
+            android:layout_marginStart="@dimen/dp_10"
+            android:layout_marginBottom="@dimen/dp_5"
             android:gravity="center"
             android:orientation="horizontal"
-            app:layout_constraintStart_toEndOf="@+id/ll_yx"
-            app:layout_constraintTop_toTopOf="@+id/ll_yx">
+            app:layout_constraintBottom_toTopOf="@+id/lottery_buttons_layout"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/ll_yx">
 
 
             <TextView
@@ -204,12 +208,12 @@
 
             <Switch
                 android:id="@+id/sw_tex"
+                tools:ignore="UseSwitchCompatOrMaterialXml"
                 android:layout_width="@dimen/dp_37"
                 android:layout_height="@dimen/dp_20"
                 android:layout_marginStart="@dimen/dp_5"
                 android:background="@drawable/room_tuner_selector_switch"
-                android:thumb="@android:color/transparent"
-                tools:ignore="UseSwitchCompatOrMaterialXml" />
+                android:thumb="@android:color/transparent" />
 
         </LinearLayout>
 
diff --git a/moduleUtil/src/main/res/layout/dialog_prize_pool.xml b/moduleUtil/src/main/res/layout/dialog_prize_pool.xml
index b59e518..e96932e 100644
--- a/moduleUtil/src/main/res/layout/dialog_prize_pool.xml
+++ b/moduleUtil/src/main/res/layout/dialog_prize_pool.xml
@@ -22,12 +22,14 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/gv_gift"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
             android:layout_marginStart="@dimen/dp_10"
             android:layout_marginEnd="@dimen/dp_10"
-            android:nestedScrollingEnabled="false"
+            android:layout_marginTop="@dimen/dp_16"
+            android:nestedScrollingEnabled="true"
             app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
             app:layout_constraintTop_toBottomOf="@+id/im_jc"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:spanCount="3"
             tools:listitem="@layout/item_prize_pool" />
 
diff --git a/moduleUtil/src/main/res/layout/web_view_dialog.xml b/moduleUtil/src/main/res/layout/web_view_dialog.xml
index 5e804ac..324f548 100644
--- a/moduleUtil/src/main/res/layout/web_view_dialog.xml
+++ b/moduleUtil/src/main/res/layout/web_view_dialog.xml
@@ -3,9 +3,20 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/gz_cl"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/color_transparent">
+        android:background="@mipmap/tkzj">
+
+        <ImageView
+            android:id="@+id/im_gz"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_36"
+            android:src="@mipmap/tkzj_gz"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <WebView
             android:id="@+id/web_view"
@@ -13,7 +24,7 @@
             android:layout_height="@dimen/dp_600"
             android:background="@color/transparent"
             android:hardwareAccelerated="true"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/im_gz"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
            />
@@ -27,7 +38,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/web_view"
-            android:visibility="visible"/>
+            android:visibility="gone"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>
\ No newline at end of file
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/jinb.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/jinb.webp
index a522871..189e064 100644
Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/jinb.webp and b/moduleUtil/src/main/res/mipmap-xxxhdpi/jinb.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/skzj_gz.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/skzj_gz.webp
new file mode 100644
index 0000000..1a9cfaa
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/skzj_gz.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_gz.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_gz.webp
new file mode 100644
index 0000000..2d80d85
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_gz.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/time_b.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/time_b.webp
new file mode 100644
index 0000000..79e8508
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/time_b.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/tkzj_gz.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/tkzj_gz.webp
new file mode 100644
index 0000000..d8c3466
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/tkzj_gz.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/tour_bj.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/tour_bj.webp
new file mode 100644
index 0000000..d5cbd95
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/tour_bj.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/tour_zj_bj.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/tour_zj_bj.webp
new file mode 100644
index 0000000..a39af3e
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/tour_zj_bj.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_cj_w.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_cj_w.webp
new file mode 100644
index 0000000..b0030dd
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_cj_w.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_g_2.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_g_2.webp
new file mode 100644
index 0000000..69320e6
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_g_2.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_gb.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_gb.webp
new file mode 100644
index 0000000..94454f1
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_gb.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_gift_user.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_gift_user.webp
new file mode 100644
index 0000000..3000122
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_gift_user.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_image.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_image.webp
new file mode 100644
index 0000000..b455740
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_image.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_jjks.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_jjks.webp
new file mode 100644
index 0000000..cee22de
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_jjks.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_num.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_num.webp
new file mode 100644
index 0000000..070afb5
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_num.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_ob.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_ob.webp
new file mode 100644
index 0000000..1b8887f
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_ob.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_xj_x.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_xj_x.webp
new file mode 100644
index 0000000..b30ef5c
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_xj_x.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_zl.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_zl.webp
new file mode 100644
index 0000000..8fab892
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_zl.webp differ
diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_zsks.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_zsks.webp
new file mode 100644
index 0000000..459306b
Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_zsks.webp differ
diff --git a/moduleUtil/src/main/res/values/styles.xml b/moduleUtil/src/main/res/values/styles.xml
index 10f10f5..1307cfe 100644
--- a/moduleUtil/src/main/res/values/styles.xml
+++ b/moduleUtil/src/main/res/values/styles.xml
@@ -22,7 +22,10 @@
         <item name="colorAccent">@color/colorAccent</item>
         <item name="android:textColor">@color/color_1F1C1F</item>
         <item name="android:textColorHint">@color/color_FF999999</item>
-        <item name="android:windowBackground">@color/color_F9FAFA</item>
+        <item name="android:windowBackground">@color/transparent</item>
+        <item name="android:windowTranslucentStatus">false</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowLightStatusBar">true</item>
         <!--        <item name="android:windowAnimationStyle">@style/AnimFade</item>-->
     </style>
 
@@ -32,7 +35,13 @@
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowIsFloating">true</item><!-- 在中间弹框、背后有遮罩的效果 -->
     </style>
-
+    <style name="TransparentActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:backgroundDimEnabled">false</item>
+    </style>
     <style name="BaseDialogStyleH" parent="Theme.AppCompat.Dialog">
         <item name="android:backgroundDimAmount">0.6</item>
         <item name="android:windowBackground">@android:color/transparent</item>
diff --git a/modulecircle/src/main/java/com/example/modulecircle/activity/ReleaseActivity.java b/modulecircle/src/main/java/com/example/modulecircle/activity/ReleaseActivity.java
index e6963f5..b2b3075 100644
--- a/modulecircle/src/main/java/com/example/modulecircle/activity/ReleaseActivity.java
+++ b/modulecircle/src/main/java/com/example/modulecircle/activity/ReleaseActivity.java
@@ -165,10 +165,15 @@ public class ReleaseActivity extends BaseMvpActivity<ReleasePresenter, ActivityR
         if (view.getId() == R.id.rl_1) {
             dialog();
         }else if (view.getId()==R.id.tv_fb){
+            if (mBinding.tvFb.getText().toString().equals("正在发布...")){
+                ToastUtils.showShort("请勿重复发布");
+                return;
+            }
             if (mBinding.etG.getText().toString().isEmpty()){
                 ToastUtils.showShort("请输入发布内容");
                 return;
             }
+            mBinding.tvFb.setText( "正在发布...");
             MvpPre.publishZone(TextUtils.join(",", uploadedUrls),mBinding.etG.getText().toString(),TextUtils.join(",", topicId),"",city1);
 
         }
@@ -322,6 +327,7 @@ public class ReleaseActivity extends BaseMvpActivity<ReleasePresenter, ActivityR
 
     @Override
     public void publishSuccess() {
+        mBinding.etG.setText( "立即发布");
         ToastUtils.showShort("发布成功");
         finish();
     }
diff --git a/modulecircle/src/main/java/com/example/modulecircle/fragment/CircleCategoryFragment.java b/modulecircle/src/main/java/com/example/modulecircle/fragment/CircleCategoryFragment.java
index d725535..d2b6271 100644
--- a/modulecircle/src/main/java/com/example/modulecircle/fragment/CircleCategoryFragment.java
+++ b/modulecircle/src/main/java/com/example/modulecircle/fragment/CircleCategoryFragment.java
@@ -58,6 +58,7 @@ public class CircleCategoryFragment extends BaseMvpFragment<CirclePresenter, Fra
     public void onResume() {
         super.onResume();
         MvpPre.getCategories();
+
         MvpPre.getCircleList("1", "10");
     }
 
@@ -224,6 +225,7 @@ public class CircleCategoryFragment extends BaseMvpFragment<CirclePresenter, Fra
     @Override
     public void setCircleList(List<CircleListBean> list) {
         if (page == 1) {
+            cirleListAdapter.setNewData(new ArrayList<>());
             cirleListAdapter.setNewData(list);
         }else {
             if (list!=null && list.size() > 0){
diff --git a/modulecircle/src/main/java/com/example/modulecircle/fragment/ExpandColumnFragment.java b/modulecircle/src/main/java/com/example/modulecircle/fragment/ExpandColumnFragment.java
index c10c921..c3ec9ae 100644
--- a/modulecircle/src/main/java/com/example/modulecircle/fragment/ExpandColumnFragment.java
+++ b/modulecircle/src/main/java/com/example/modulecircle/fragment/ExpandColumnFragment.java
@@ -25,6 +25,7 @@ import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
 import org.angmarch.views.NiceSpinner;
 import org.angmarch.views.OnSpinnerItemSelectedListener;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
@@ -61,10 +62,13 @@ public class ExpandColumnFragment extends BaseMvpFragment<CirclePresenter, Fragm
                 mBinding.niceSpinner.setText(item);
                 if (item.equals("只看女生")){
                     type="2";
+                    page=1;
                 }else if (item.equals("只看男生")){
                     type="1";
+                    page=1;
                 }else {
                     type="0";
+                    page=1;
                 }
                 MvpPre.getExpandColumn(type,"1", "10");
 //                mBinding.niceSpinner.getItemAtPosition(position);
@@ -136,6 +140,7 @@ public class ExpandColumnFragment extends BaseMvpFragment<CirclePresenter, Fragm
     @Override
     public void onResume() {
         super.onResume();
+        page=1;
         MvpPre.getExpandColumn(type,"1", "10");
     }
     @Override
@@ -160,11 +165,33 @@ public class ExpandColumnFragment extends BaseMvpFragment<CirclePresenter, Fragm
 
     @Override
     public void setExpandColumn(List<ExpandColumnBean> list) {
-        if (page==1) {
-            expandColumnAdapter.setNewData(list);
-        }else {
-            if (list!=null && list.size()>0){
-                expandColumnAdapter.addData(list);
+        if (type.equals("2")) {
+            if (page == 1) {
+                expandColumnAdapter.setNewData(new ArrayList<>());
+                expandColumnAdapter.setNewData(list);
+            } else {
+                if (list != null && list.size() > 0) {
+                    expandColumnAdapter.addData(list);
+                }
+            }
+        }else if (type.equals("1")){
+            if (page == 1) {
+                expandColumnAdapter.setNewData(new ArrayList<>());
+                expandColumnAdapter.setNewData(list);
+            } else {
+                if (list != null && list.size() > 0) {
+                    expandColumnAdapter.addData(list);
+                }
+            }
+
+        }else if (type.equals("0")){
+            if (page == 1) {
+                expandColumnAdapter.setNewData(new ArrayList<>());
+                expandColumnAdapter.setNewData(list);
+            } else {
+                if (list != null && list.size() > 0) {
+                    expandColumnAdapter.addData(list);
+                }
             }
         }
     }
diff --git a/moduleroom/src/main/AndroidManifest.xml b/moduleroom/src/main/AndroidManifest.xml
index cfe9c6b..4d17fc9 100644
--- a/moduleroom/src/main/AndroidManifest.xml
+++ b/moduleroom/src/main/AndroidManifest.xml
@@ -15,9 +15,10 @@
         <activity
             android:name=".activity.RoomActivity"
             android:exported="false"
-            android:launchMode="singleInstance"
+            android:launchMode="singleTask"
             android:windowSoftInputMode="adjustPan"
             android:enableOnBackInvokedCallback="false"
+            android:theme="@style/TransparentActivityTheme"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:screenOrientation="portrait" />
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.java b/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.java
index 20edd48..311c473 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.java
@@ -153,7 +153,9 @@ import java.lang.ref.WeakReference;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import io.agora.musiccontentcenter.Music;
@@ -216,6 +218,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
             sDestroied = false;
 //            MvpPre.getRoomIn(roomId, password);
 //            MvpPre.getRoomOnline(roomId, "1", "10");
+
         } else {
             releaseRoom();
             startActivity(intent);
@@ -241,6 +244,10 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
         }
     }
 
+    public void clearData(){
+        publicScreenFragment.someMethod();
+    }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void roomInfoEvent(SurfaceEvent surfaceView) {
         if (mRoomInfoResp.getRoom_info().getType_id().equals("6")) {//判断是否是电影房
@@ -300,6 +307,8 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        // 在super.onCreate之前设置主题以避免闪白屏
+        setTheme(com.xscm.moduleutil.R.style.BaseAppTheme); // 设置你的主主题
         super.onCreate(savedInstanceState);
         isSave = false;
         sDestroied = false;
@@ -311,27 +320,72 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
 
         overridePendingTransition(0, 0); // 关闭转场动画
 
-        floatingMagnetView = findViewById(R.id.flaoat);
-        ivQuan = findViewById(R.id.iv_quan);
-        fullScreenContainer = findViewById(R.id.fullscreen_container); // 自定义全屏容器
-        ivExitFullscreen = findViewById(R.id.iv_exit_fullscreen);
-        ivQuan.setOnClickListener(v -> toggleFullScreen());
-        ivExitFullscreen.setOnClickListener(v -> exitFullScreen());
 
-        LogUtils.e("lxj", "开始时间：" + TimeUtils.date2String(new Date()));
-
-        if (taskId != null) {
-            if (taskId.equals("9")) {
-                MyRoomSingleton.getInstance().onEnterRoom(taskId);
-            }
-        }
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
         sActivityRef = new WeakReference<>(this);
+
+        SpUtil.saveMyRoomId(roomId);
+//        MvpPre.getRoomIn(roomId, password);
+//        MvpPre.getRoomOnline(roomId, "1", "10");
+        // 在子线程中执行网络请求
+        performNetworkRequestsAsync();
     }
+
+    /**
+     * 在子线程中执行网络请求，避免阻塞主线程
+     */
+    private void performNetworkRequestsAsync() {
+        ThreadUtils.executeByIo(new ThreadUtils.SimpleTask<Void>() {
+            @Override
+            public Void doInBackground() throws Throwable {
+                // 在后台线程执行网络请求前的准备工作
+                // 例如：检查缓存、预处理数据等
+//                prepareNetworkRequest();
+                return null;
+            }
+
+            @Override
+            public void onSuccess(Void result) {
+                // 切换到主线程执行实际的网络请求
+                runOnUiThread(() -> {
+                    // 使用Handler确保在主线程中调用
+                    new android.os.Handler(Looper.getMainLooper()).post(() -> {
+                        MvpPre.getRoomIn(roomId, password);
+                        MvpPre.getRoomOnline(roomId, "1", "10");
+                    });
+                });
+            }
+
+            @Override
+            public void onFail(Throwable e) {
+                LogUtils.e("Network request preparation failed: " + e.getMessage());
+                // 即使准备失败，也尝试执行网络请求
+                runOnUiThread(() -> {
+                    MvpPre.getRoomIn(roomId, password);
+                    MvpPre.getRoomOnline(roomId, "1", "10");
+                });
+            }
+        });
+    }
+
+//    /**
+//     * 网络请求前的准备工作
+//     */
+//    private void prepareNetworkRequest() {
+//        try {
+//            // 可以在这里做一些轻量级的预处理工作
+//            // 例如：检查网络状态、准备请求参数等
+//            LogUtils.d("Preparing network request for room: " + roomId);
+//        } catch (Exception e) {
+//            LogUtils.e("Error in prepareNetworkRequest: " + e.getMessage());
+//        }
+//    }
+
     // 提供安全的访问方法
     public static RoomActivity getCurrentActivity() {
         return sActivityRef != null ? sActivityRef.get() : null;
     }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onRoomTaskEvent(RoomTaskEvent event) {
         if (taskId != null && !taskId.equals("9")) {//这是每日任务完成发送私聊信息的事件
@@ -356,6 +410,20 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
     @Override
     protected void initView() {
         super.initView();
+        floatingMagnetView = findViewById(R.id.flaoat);
+        ivQuan = findViewById(R.id.iv_quan);
+        fullScreenContainer = findViewById(R.id.fullscreen_container); // 自定义全屏容器
+        ivExitFullscreen = findViewById(R.id.iv_exit_fullscreen);
+        ivQuan.setOnClickListener(v -> toggleFullScreen());
+        ivExitFullscreen.setOnClickListener(v -> exitFullScreen());
+
+        LogUtils.e("lxj", "开始时间：" + TimeUtils.date2String(new Date()));
+
+        if (taskId != null) {
+            if (taskId.equals("9")) {
+                MyRoomSingleton.getInstance().onEnterRoom(taskId);
+            }
+        }
         circularProgress = mBinding.giftShowProgress;
         circularProgress.setProgress(0);
         mBinding.giftShowLayout.setOnClickListener(new View.OnClickListener() {
@@ -369,7 +437,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
         ThemeableDrawableUtils.setThemeableRoundedBackground(mBinding.roomTop.btnFollow, ColorManager.getInstance().getPrimaryColorInt(), 53);
         mBinding.roomTop.btnFollow.setTextColor(ColorManager.getInstance().getButtonColorInt());
         initPublicScreenFragment();
-        stub= mBinding.roomTop.stubButtons.getViewStub();
+        stub = mBinding.roomTop.stubButtons.getViewStub();
 
         // 为透明 View 设置触摸监听
         mBinding.roomTop.rlTop.setOnTouchListener(new View.OnTouchListener() {
@@ -576,10 +644,9 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
         mBinding.rlMore.setOnClickListener(this::onClick);
         mBinding.rlMessage.setOnClickListener(this::onClick);
 
-//        MessageListenerSingleton.getInstance().joinGroup(roomId);
-        SpUtil.saveMyRoomId(roomId);
-        MvpPre.getRoomIn(roomId, password);
-        MvpPre.getRoomOnline(roomId, "1", "10");
+//        SpUtil.saveMyRoomId(roomId);
+//        MvpPre.getRoomIn(roomId, password);
+//        MvpPre.getRoomOnline(roomId, "1", "10");
         mBinding.inputMenu1.performClick();
 
         V2TIMManager.getConversationManager().getTotalUnreadMessageCount(new V2TIMValueCallback<Long>() {
@@ -709,9 +776,86 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
             handleMsgType1034(messageEvent, text);
         } else if (msgType == 1016) {
             handleMsgType1016(messageEvent, text);
+        } else if (msgType == 1039) {
+            handleMsgType1039(messageEvent, text);
         }
     }
 
+    private Map<String, RoomPitBean> pitMap = new HashMap<>();
+
+    public void handleMsgType1039(RoomMessageEvent messageEvent, RoomMessageEvent.T text) {
+        if (text == null || mRoomInfoResp == null || mRoomInfoResp.getRoom_info() == null) return;
+
+        pitMap.clear();
+        if (mRoomInfoResp.getRoom_info().getPit_list() != null && !mRoomInfoResp.getRoom_info().getPit_list().isEmpty()) {
+            for (RoomPitBean roomPitBean : mRoomInfoResp.getRoom_info().getPit_list()) {
+                pitMap.put(roomPitBean.getPit_number(), roomPitBean);
+            }
+
+            String fromPitNumber = text.getFrom_pit_number();
+            String toPitNumber = text.getTo_pit_number();
+
+            if (!TextUtils.isEmpty(fromPitNumber) && !TextUtils.isEmpty(toPitNumber)) {
+                performSwitchMic(fromPitNumber, toPitNumber);
+            }
+            // 执行换麦逻辑
+
+        }
+    }
+
+    private void performSwitchMic(String fromPitNumber, String toPitNumber) {
+        if (TextUtils.isEmpty(fromPitNumber) || TextUtils.isEmpty(toPitNumber)) {
+            return;
+        }
+
+        // 获取房间信息中的 pit_list
+        List<RoomPitBean> pitList = mRoomInfoResp.getRoom_info().getPit_list();
+
+        if (pitList == null || pitList.isEmpty()) {
+            LogUtils.e("pit_list is null or empty");
+            return;
+        }
+
+        // 查找两个麦位对应的 RoomPitBean
+        RoomPitBean fromBean = null;
+        RoomPitBean toBean = null;
+        List<RoomPitBean> pitListCopy = new ArrayList<>();
+        for (RoomPitBean bean : pitList) {
+            if (bean.getPit_number().equals(fromPitNumber)) {
+                fromBean = bean;
+                pitListCopy.add(bean);
+            } else if (bean.getPit_number().equals(toPitNumber)) {
+                toBean = bean;
+                pitListCopy.add(bean);
+            }
+        }
+
+        pitList.removeAll(pitListCopy);
+        // 如果没有找到任一麦位，则不执行操作
+        if (fromBean == null || toBean == null) {
+            LogUtils.e("Cannot find pit number: from=" + fromPitNumber + ", to=" + toPitNumber);
+            return;
+        }
+
+        // 交换 pit_number
+        String temp = fromBean.getPit_number();
+        fromBean.setPit_number(toBean.getPit_number());
+        toBean.setPit_number(temp);
+        pitList.add(fromBean);
+        pitList.add(toBean);// 在调用 setPit_list 之前，先对 pitList 按照 pit_number 升序排序
+        pitList.sort((a, b) -> {
+            try {
+                return Integer.compare(Integer.parseInt(a.getPit_number()), Integer.parseInt(b.getPit_number()));
+            } catch (NumberFormatException e) {
+                return a.getPit_number().compareTo(b.getPit_number()); // 字符串比较作为备选
+            }
+        });
+
+        mRoomInfoResp.getRoom_info().setPit_list(pitList);
+        roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
+    }
+
+
     private void handleMsgType1005(RoomMessageEvent messageEvent, RoomMessageEvent.T text) {
         if (text == null || mRoomInfoResp == null || mRoomInfoResp.getRoom_info() == null) return;
 
@@ -719,23 +863,38 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
         UserInfo toUserInfo = text.getToUserInfo();
         if (giftInfo == null || toUserInfo == null) return;
 
-        mBinding.svgaGift.setSource(giftInfo.getPlay_image(), 2);
+//        mBinding.svgaGift.setSource(giftInfo.getPlay_image(), 2);
+
+
+        // 在子线程中处理礼物特效播放
+        ThreadUtils.executeByIo(new ThreadUtils.SimpleTask<Void>() {
+            @Override
+            public Void doInBackground() throws Throwable {
+                // 预处理礼物数据（如果需要）
+                return null;
+            }
+
+            @Override
+            public void onSuccess(Void result) {
+                // 在主线程中更新UI
+                runOnUiThread(() -> {
+                    try {
+                        // 使用post方法确保在下一个消息循环中执行
+                        mBinding.svgaGift.post(() -> {
+                            mBinding.svgaGift.setSource(giftInfo.getPlay_image(), 2);
+                        });
+                    } catch (Exception e) {
+                        LogUtils.e("Error setting gift source: " + e.getMessage());
+                    }
+                });
+            }
+        });
 
         List<RoomPitBean> pitList = mRoomInfoResp.getRoom_info().getPit_list();
         if (pitList == null) return;
 
-        for (RoomPitBean roomPitBean : pitList) {
-            if (roomPitBean.getUser_id().equals(toUserInfo.getUser_id() + "")) {
-                roomPitBean.setCharm(toUserInfo.getCharm());
-                try {
-                    pitList.set(Integer.parseInt(roomPitBean.getPit_number()) - 1, roomPitBean);
-                } catch (NumberFormatException e) {
-                    // Handle exception
-                }
-            }
-        }
 
-        roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
+//        roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
 
         String typeId = mRoomInfoResp.getRoom_info().getType_id();
         if ("2".equals(typeId)) {
@@ -747,6 +906,18 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
             } else if ("1".equals(labelId)) {
                 roomFragment.SingSongEvent(messageEvent);
             }
+        } else {
+            for (RoomPitBean roomPitBean : pitList) {
+                if (roomPitBean.getUser_id().equals(toUserInfo.getUser_id() + "")) {
+                    roomPitBean.setCharm(toUserInfo.getCharm());
+                    try {
+                        pitList.set(Integer.parseInt(roomPitBean.getPit_number()) - 1, roomPitBean);
+                    } catch (NumberFormatException e) {
+                        // Handle exception
+                    }
+                }
+            }
+            roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
         }
     }
 
@@ -836,12 +1007,19 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
                     mRoomInfoResp.getUser_info().setPit_number(Integer.parseInt(pitNumber));
                 }
             }
+            roomFragment.upRoomInfo(mRoomInfoResp);
+            roomFragment.handleAuctionMessageEvent(messageEvent);
         } else if ("3".equals(typeId) || "4".equals(typeId) || "1".equals(typeId)) {
             String labelId = mRoomInfoResp.getRoom_info().getLabel_id();
             if ("2".equals(labelId)) {
                 roomFragment.KtvFragmentEvent(messageEvent);
             } else if ("1".equals(labelId)) {
                 roomFragment.SingSongEvent(messageEvent);
+                if (mRoomInfoResp.getUser_info().getPit_number() == 9) {
+                    ivSoundEffects(true);
+                } else {
+                    ivSoundEffects(false);
+                }
             }
         } else if ("7".equals(typeId)) {
             List<RoomPitBean> pitList = mRoomInfoResp.getRoom_info().getPit_list();
@@ -911,13 +1089,17 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
                     switchMic(2);
                 }
             }
-            roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
+            roomFragment.upRoomInfo(mRoomInfoResp);
+            roomFragment.handleAuctionMessageEvent(messageEvent);
         } else if ("3".equals(typeId) || "4".equals(typeId) || "1".equals(typeId)) {
             String labelId = mRoomInfoResp.getRoom_info().getLabel_id();
             if ("2".equals(labelId)) {
                 roomFragment.KtvFragmentEvent(messageEvent);
             } else if ("1".equals(labelId)) {
                 roomFragment.SingSongEvent(messageEvent);
+                if (mRoomInfoResp.getUser_info().getUser_id().equals(SpUtil.getUserId() + "")) {
+                    ivSoundEffects(false);
+                }
             }
         } else {
             List<RoomPitBean> pitList = mRoomInfoResp.getRoom_info().getPit_list();
@@ -955,7 +1137,6 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
                 if (userId == currentUserId) {
                     setRoleType(3, 888);
                     switchMic(2);
-                    CardRelationshipFragment.show(mRoomInfoResp.getRoom_info().getRoom_id(), currentUserId + "", type + "", getSupportFragmentManager());
                 }
             }
         } else if (text.getType() == 2) {
@@ -971,24 +1152,36 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
             }
         }
 
-        roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
+        roomFragment.upRoomInfo(mRoomInfoResp);
         roomFragment.handleAuctionMessageEvent(messageEvent);
     }
 
     private void handleMsgType1023(RoomMessageEvent messageEvent, RoomMessageEvent.T text) {
-        if (text == null || mRoomInfoResp == null || mRoomInfoResp.getRoom_auction() == null) return;
+        if (text == null || mRoomInfoResp == null || mRoomInfoResp.getRoom_auction() == null)
+            return;
 
         mRoomInfoResp.getRoom_auction().setAuction_user(text.getAuction_user());
         SpUtil.setAuctionId(text.getAuction_user().getAuction_id());
-        roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
+        roomFragment.upRoomInfo(mRoomInfoResp);
+        roomFragment.handleAuctionMessageEvent(messageEvent);
+//        roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
     }
 
     private void handleMsgType1024(RoomMessageEvent messageEvent, RoomMessageEvent.T text) {
-        if (text == null || mRoomInfoResp == null || mRoomInfoResp.getRoom_auction() == null) return;
-
-        mRoomInfoResp.getRoom_auction().getAuction_list().clear();
-        mRoomInfoResp.getRoom_auction().getAuction_list().addAll(text.getAuction_list());
-        roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
+        if (text == null || mRoomInfoResp == null || mRoomInfoResp.getRoom_auction() == null)
+            return;
+        if (mRoomInfoResp.getRoom_auction().getAuction_list() != null) {
+            mRoomInfoResp.getRoom_auction().getAuction_list().clear();
+        }
+        if (mRoomInfoResp.getRoom_auction().getAuction_list() != null) {
+            mRoomInfoResp.getRoom_auction().getAuction_list().addAll(text.getAuction_list());
+        } else {
+            mRoomInfoResp.getRoom_auction().setAuction_list(new ArrayList<>());
+            mRoomInfoResp.getRoom_auction().getAuction_list().addAll(text.getAuction_list());
+        }
+        roomFragment.upRoomInfo(mRoomInfoResp);
+        roomFragment.handleAuctionMessageEvent(messageEvent);
+//        roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
     }
 
     private void handleMsgType1020(RoomMessageEvent messageEvent, RoomMessageEvent.T text) {
@@ -1037,12 +1230,15 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
                 roomFragment.KtvFragmentEvent(messageEvent);
             } else {
                 updateCharmForAllPitBeans("");
+                roomFragment.upRoomInfo(mRoomInfoResp);
+                roomFragment.SingSongEvent(messageEvent);
             }
         } else {
             updateCharmForAllPitBeans("");
+            roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
         }
 
-        roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
+
     }
 
     private void updateCharmForAllPitBeans(String charm) {
@@ -1166,20 +1362,23 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
             if ("2".equals(labelId)) {
                 roomFragment.KtvFragmentEvent(messageEvent);
             } else {
-                updatePitBeanForUser(fromUserInfo);
+//                updatePitBeanForUser(fromUserInfo);
+                roomFragment.upRoomInfo(updatePitBeanForUser(fromUserInfo));
+                roomFragment.SingSongEvent(messageEvent);
             }
         } else {
             updatePitBeanForUser(fromUserInfo);
+            roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
         }
 
-        roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
+
     }
 
-    private void updatePitBeanForUser(UserInfo fromUserInfo) {
-        if (mRoomInfoResp == null || mRoomInfoResp.getRoom_info() == null) return;
+    private RoomInfoResp updatePitBeanForUser(UserInfo fromUserInfo) {
+        if (mRoomInfoResp == null || mRoomInfoResp.getRoom_info() == null) return mRoomInfoResp;
 
         List<RoomPitBean> pitList = mRoomInfoResp.getRoom_info().getPit_list();
-        if (pitList == null) return;
+        if (pitList == null) return mRoomInfoResp;
 
         for (RoomPitBean pitBean : pitList) {
             if (pitBean.getUser_id().equals(fromUserInfo.getUser_id() + "")) {
@@ -1190,6 +1389,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
                 pitBean.setDress(fromUserInfo.getDress());
             }
         }
+        return mRoomInfoResp;
     }
 
     private void handleMsgType125(RoomMessageEvent messageEvent, RoomMessageEvent.T text) {
@@ -1212,14 +1412,16 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
     private void handleMsgType1007() {
         if (mRoomInfoResp != null && mRoomInfoResp.getUser_info() != null) {
             mRoomInfoResp.getUser_info().setIs_host(1);
-            roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
+            roomFragment.upRoomInfo(mRoomInfoResp);
+//            roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
         }
     }
 
     private void handleMsgType1018() {
         if (mRoomInfoResp != null && mRoomInfoResp.getUser_info() != null) {
             mRoomInfoResp.getUser_info().setIs_host(0);
-            roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
+            roomFragment.upRoomInfo(mRoomInfoResp);
+//            roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
         }
     }
 
@@ -1263,420 +1465,6 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
         }
     }
 
-//    public void roomInfoEvent(RoomMessageEvent messageEvent) {
-//        if (messageEvent.getMsgType() == 1005) {
-//            mBinding.svgaGift.setSource(messageEvent.getText().getGiftInfo().getPlay_image(), 2);
-//            for (RoomPitBean roomPitBean : mRoomInfoResp.getRoom_info().getPit_list()) {
-//                if (roomPitBean.getUser_id().equals(messageEvent.getText().getToUserInfo().getUser_id() + "")) {
-//                    roomPitBean.setCharm(messageEvent.getText().getToUserInfo().getCharm());
-//                    mRoomInfoResp.getRoom_info().getPit_list().set(Integer.parseInt(roomPitBean.getPit_number()) - 1, roomPitBean);
-//                }
-//            }
-//            roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
-//            if (mRoomInfoResp.getRoom_info().getType_id().equals("2")) {
-//                roomFragment.handleAuctionMessageEvent(messageEvent);
-//            }else if (mRoomInfoResp.getRoom_info().getType_id().equals("1") || mRoomInfoResp.getRoom_info().getType_id().equals("4")  || mRoomInfoResp.getRoom_info().getType_id().equals("3")){
-//                if (mRoomInfoResp.getRoom_info().getLabel_id().equals("2")){
-//                    roomFragment.KtvFragmentEvent(messageEvent);
-//                }else if (mRoomInfoResp.getRoom_info().getLabel_id().equals("1")){
-//                    roomFragment.SingSongEvent(messageEvent);
-//                }
-//            }
-//
-//        } else if (messageEvent.getMsgType() == 123) {
-//            EventBus.getDefault().post(new RoomSettingEvent());
-//        } else if (messageEvent.getMsgType() == 1014) {
-//            RoomSettingEvent roomSettingEvent = new RoomSettingEvent();
-//            roomSettingEvent.setRoomId(messageEvent.getRoomId());
-//            roomSettingEvent.setRoom_up_pit_type(messageEvent.getText().getRoom_up_pit_type());
-//            roomSettingEvent.setType(messageEvent.getMsgType());
-//            mRoomBean.setRoom_up_pit_type(messageEvent.getText().getRoom_up_pit_type() + "");
-//
-//            EventBus.getDefault().post(mRoomBean);
-//            EventBus.getDefault().post(roomSettingEvent);
-//        } else if (messageEvent.getMsgType() == 1013) {///点歌/切歌/同意点歌
-//            int userid = messageEvent.getText().getFromUserInfo().getUser_id();
-//            int userId2 = SpUtil.getUserId();
-//
-//            if (messageEvent.getText().getAction() == 1 && mRoomUserBean.getUser_id().equals(userId2 + "") && mRoomUserBean.getPit_number() == 9) {
-//                queren(messageEvent.getText().getFromUserInfo().getNickname());
-//            } else if (messageEvent.getText().getAction() == 4 && userid == userId2) {
-//                queren1(messageEvent.getText().getFromUserInfo().getNickname());
-//            } else {
-//                roomFragment.KtvFragmentEvent(messageEvent);
-//            }
-//        } else if (messageEvent.getMsgType() == 1012) {//房间类型发生变化
-//            if (customMusicFloatingView != null) {
-//                customMusicFloatingView.destroy();
-//            }
-//            AgoraManager.getInstance(RoomActivity.this).desMusic();
-//            stub.setVisibility(View.GONE);
-//            MvpPre.postRoomInfo(roomId);
-//        } else if (messageEvent.getMsgType() == 124) {
-//            RoomMessageEvent.text text = GsonUtils.fromJson(messageEvent.getText().getText(), RoomMessageEvent.text.class);
-//            MusicPlayBean musicPlayBean = new MusicPlayBean();
-//            musicPlayBean.setPosition(text.getPosition());
-//            EventBus.getDefault().post(musicPlayBean);
-//        } else if (messageEvent.getMsgType() == 1003) {//上麦操作
-//            if (messageEvent.getText().getPit_number().equals("9") && messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
-//                mBinding.roomTop.rl.setVisibility(View.VISIBLE);
-//            }
-//            if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
-//                aBoolean = false;
-//                ivWheatFeeding(com.xscm.moduleutil.R.mipmap.room_wheat_feeding_up);
-//                setBoolean(aBoolean);
-//                mRoomInfoResp.getUser_info().setPit_number(messageEvent.getText().getPit_number() != null ? Integer.parseInt(messageEvent.getText().getPit_number()) : 0);
-//                setRoleType(3, Integer.parseInt(messageEvent.getText().getPit_number()));
-//                switchMic(2);
-//            }
-//
-//            if (mRoomInfoResp.getRoom_info().getType_id().equals("2")) {///拍卖房上麦操作
-//
-//                if (messageEvent.getText().getPit_number().equals("9")) {
-//                    mRoomInfoResp.getRoom_info().getPit_list().set(0, getPitBean(messageEvent));
-//                    mRoomInfoResp.getUser_info().setPit_number(Integer.parseInt(messageEvent.getText().getPit_number()));
-//
-//                }
-//            } else if (mRoomInfoResp.getRoom_info().getType_id().equals("3") || mRoomInfoResp.getRoom_info().getType_id().equals("4") || mRoomInfoResp.getRoom_info().getType_id().equals("1")) {
-//                if (mRoomInfoResp.getRoom_info().getLabel_id().equals("2")) {
-//                    roomFragment.KtvFragmentEvent(messageEvent);
-//                }else if (mRoomInfoResp.getRoom_info().getLabel_id().equals("1")) {
-//                    roomFragment.SingSongEvent(messageEvent);
-//                }
-//            } else if (mRoomInfoResp.getRoom_info().getType_id().equals("7")) {
-//                RoomPitBean pitBean = mRoomInfoResp.getRoom_info().getPit_list().get(Integer.parseInt(messageEvent.getText().getPit_number()) - 1);
-//                pitBean.setUser_id(messageEvent.getText().getFromUserInfo().getUser_id() + "");
-//                pitBean.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
-//                pitBean.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
-//                pitBean.setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
-//                pitBean.setCharm(messageEvent.getText().getFromUserInfo().getCharm());
-//                pitBean.setDress(messageEvent.getText().getFromUserInfo().getDress());
-//                mRoomInfoResp.getRoom_info().getPit_list().set(Integer.parseInt(messageEvent.getText().getPit_number()) - 1, pitBean);
-//                roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
-//            }else {
-//                roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
-//            }
-//
-//        } else if (messageEvent.getMsgType() == 1004) {//下麦操作
-//
-//            if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
-////                mBinding.ivWheatFeeding.setImageResource(com.xscm.moduleutil.R.mipmap.room_wheat_feeding);
-//                aBoolean = true;
-//                ivWheatFeeding(com.xscm.moduleutil.R.mipmap.room_wheat_feeding);
-//                setBoolean(aBoolean);
-//                mRoomInfoResp.getUser_info().setPit_number(0);
-//                setRoleType(0, 0);
-//                switchMic(2);
-//            }
-//
-//            if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId() && messageEvent.getText().getPit_number().equals("9")) {
-//                if (customMusicFloatingView != null) {
-//                    customMusicFloatingView.destroy();
-//                    AgoraManager.getInstance(RoomActivity.this).desMusic();
-//                    isMusic = false;
-//                    mBinding.roomTop.rl.setVisibility(GONE);
-//                }
-//            }
-//            if (mRoomInfoResp.getRoom_info().getType_id().equals("2")) {
-//                if (messageEvent.getText().getPit_number().equals("9")) {
-//                    if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
-//                        mRoomInfoResp.getRoom_info().getPit_list().set(0, getPitBean2(messageEvent, "9"));
-//                        mRoomInfoResp.getUser_info().setPit_number(0);
-//                    }
-//                } else if (messageEvent.getText().getPit_number().equals("888")) {
-//                    mRoomInfoResp.setRoom_auction(null);
-//                    if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
-//                        setRoleType(0, 0);
-//                        switchMic(2);
-//                    }
-//                }
-//                roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
-//            } else if (mRoomInfoResp.getRoom_info().getType_id().equals("3") || mRoomInfoResp.getRoom_info().getType_id().equals("4") || mRoomInfoResp.getRoom_info().getType_id().equals("1")) {
-//                if (mRoomInfoResp.getRoom_info().getLabel_id().equals("2")) {
-//                    roomFragment.KtvFragmentEvent(messageEvent);
-//                }else if (mRoomInfoResp.getRoom_info().getLabel_id().equals("1")) {
-//                    roomFragment.SingSongEvent(messageEvent);
-//                }
-//            } else {
-//
-//                RoomPitBean pitBean = mRoomInfoResp.getRoom_info().getPit_list().get(Integer.parseInt(messageEvent.getText().getPit_number()) - 1);
-//                pitBean.setUser_id("");
-//                pitBean.setAvatar("");
-//                pitBean.setNickname("");
-//                pitBean.setSex("");
-//                pitBean.setCharm("");
-//                pitBean.setDress("");
-//                mRoomInfoResp.getRoom_info().getPit_list().set(Integer.parseInt(messageEvent.getText().getPit_number()) - 1, pitBean);
-//                roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
-//            }
-//
-//
-//
-//        } else if (messageEvent.getMsgType() == 1022) {
-//            if (messageEvent.getText().getType() == 1) {//拍卖位上麦
-//                if (messageEvent.getText().getPit_number().equals("888")) {
-//                    int type = -1; // 或其他默认值
-//                    if (mRoomInfoResp.getRoom_info().getType_id().equals("2")) {
-//                        type = (mRoomInfoResp.getRoom_info().getLabel_id().equals("1")) ? 1 : 2;
-//                    }
-//                    if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
-//                        setRoleType(3, 888);
-//                        switchMic(2);
-//                        CardRelationshipFragment.show(mRoomInfoResp.getRoom_info().getRoom_id(), SpUtil.getUserId() + "", type + "", getSupportFragmentManager());
-//                    }
-//                }
-//            } else if (messageEvent.getText().getType() == 2) {//拍卖位下麦
-//                if (messageEvent.getText().getPit_number().equals("9")) {
-//                    setRoleType(0, 0);
-//                    switchMic(2);
-//                } else if (messageEvent.getText().getPit_number().equals("888")) {
-//                    mRoomInfoResp.setRoom_auction(new RoomAuction());
-//                    if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
-//                        setRoleType(0, 0);
-//                        switchMic(2);
-//                    }
-//                }
-//            }
-//            roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
-//            roomFragment.handleAuctionMessageEvent(messageEvent);
-//        } else if (messageEvent.getMsgType() == 1023) {
-//            mRoomInfoResp.getRoom_auction().setAuction_user(messageEvent.getText().getAuction_user());
-//            SpUtil.setAuctionId(messageEvent.getText().getAuction_user().getAuction_id());
-//            roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
-//        } else if (messageEvent.getMsgType() == 1024) {//竞拍，拍卖列表变化
-//            mRoomInfoResp.getRoom_auction().getAuction_list().clear();
-//            mRoomInfoResp.getRoom_auction().getAuction_list().addAll(messageEvent.getText().getAuction_list());
-//            roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
-//        } else if (messageEvent.getMsgType() == 1025) {//结束
-//            roomFragment.handleAuctionMessageEvent(messageEvent);
-//        } else if (messageEvent.getMsgType() == 1026) {//主持延迟
-//            roomFragment.handleAuctionMessageEvent(messageEvent);
-//        } else if (messageEvent.getMsgType() == 1027) {//拍卖类型变化
-////            mRoomInfoResp.getRoom_info().setLabel_id(messageEvent.getText().getText()+"");
-////            roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
-//            roomFragment.handleAuctionMessageEvent(messageEvent);
-//        } else if (messageEvent.getMsgType() == 1020) {
-//            mRoomBean = messageEvent.getText().getRoomInfo();
-//            EventBus.getDefault().post(mRoomBean);
-//            changeBackgroundColor(mRoomBean.getRoom_background());
-//        } else if (messageEvent.getMsgType() == 1011) {
-//            if (messageEvent.getText().getFromUserInfo() != null) {
-//                if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
-//                    MvpPre.quitRoom(roomId, SpUtil.getUserId() + "");
-//                }
-//            }
-//        } else if (messageEvent.getMsgType() == 1001) {
-//            number++;
-//            mBinding.roomTop.tvNum.setText(number + "");
-//        } else if (messageEvent.getMsgType() == 1002) {
-//            number--;
-//            mBinding.roomTop.tvNum.setText(number + "");
-//        } else if (messageEvent.getMsgType() == 1029) {
-//            if (mRoomInfoResp.getUser_info().getPit_number() == 9 && mRoomInfoResp.getUser_info().getUser_id().equals(SpUtil.getUserId() + "")) {
-//                querenPk(messageEvent.getText().getText(), messageEvent.getText().getPkId());
-//            }
-//        } else if (messageEvent.getMsgType() == 1021) {//清除魅力值
-////            EventBus.getDefault().post(new RoomClearCardiacRunnable(messageEvent.getRoomId()));
-//            if (mRoomInfoResp.getRoom_info().getType_id().equals("2")) {
-//                roomFragment.handleAuctionMessageEvent(messageEvent);
-//            }else if (mRoomInfoResp.getRoom_info().getType_id().equals("1") || mRoomInfoResp.getRoom_info().getType_id().equals("4") || mRoomInfoResp.getRoom_info().getType_id().equals("3")){
-//                if (mRoomInfoResp.getRoom_info().getLabel_id().equals("2")){
-//                    roomFragment.KtvFragmentEvent(messageEvent);
-//                }else {
-//                    for (RoomPitBean roomPitBean : mRoomInfoResp.getRoom_info().getPit_list()) {
-//                        roomPitBean.setCharm("");
-//                        mRoomInfoResp.getRoom_info().getPit_list().set(Integer.parseInt(roomPitBean.getPit_number()) - 1, roomPitBean);
-//                    }
-//                    roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
-//                }
-//            }
-//            else {
-//                for (RoomPitBean roomPitBean : mRoomInfoResp.getRoom_info().getPit_list()) {
-//                    roomPitBean.setCharm("");
-//                    mRoomInfoResp.getRoom_info().getPit_list().set(Integer.parseInt(roomPitBean.getPit_number()) - 1, roomPitBean);
-//                }
-//                roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
-//            }
-//        } else if (messageEvent.getMsgType() == 1036) {
-//            if (messageEvent.getText().getRoom_id().equals(roomId)) {
-//                if (!mBinding.roomTop.tvNum.getText().toString().equals(messageEvent.getText().getOnline_number() + "")) {
-//                    mBinding.roomTop.tvNum.setText(messageEvent.getText().getOnline_number() + "");
-//                }
-//            }
-//        } else if (messageEvent.getMsgType() == 1049) {//交友房阶段发生变化
-//            if (messageEvent.getText().getStep() != 3) {
-//                if (messageEvent.getText().getEnd_time() != null) {
-//                    roomFragment.updateFriendshipState(messageEvent.getText().getStep(), messageEvent.getText().getFriend_id(), Long.parseLong(messageEvent.getText().getEnd_time()), null);
-//                } else {
-//                    roomFragment.updateFriendshipState(messageEvent.getText().getStep(), messageEvent.getText().getFriend_id(), 0, null);
-//                }
-//            } else {
-//                roomFragment.updateFriendshipState(messageEvent.getText().getStep(), messageEvent.getText().getFriend_id(), 0, messageEvent.getText().getFriend_user());
-//            }
-//        } else if (messageEvent.getMsgType() == 1050) {//交友=房间时间发生延时
-//            roomFragment.friendTimeDelayWithTime(Long.parseLong(messageEvent.getText().getEnd_time()));
-//        } else if (messageEvent.getMsgType() == 1051) {
-//            FriendUserBean friend_user = getFriendUserBean(messageEvent);
-//            FriendsDialogFragment.show(friend_user, getSupportFragmentManager());
-//
-//
-//            if (messageEvent.getText().getUser1_id().equals(SpUtil.getUserId() + "") ||
-//                    messageEvent.getText().getUser2_id().equals(SpUtil.getUserId() + "")) {
-//
-//                // 取消之前的延迟任务
-//                if (roomSwitchRunnable != null) {
-//                    roomSwitchHandler.removeCallbacks(roomSwitchRunnable);
-//                }
-//
-//                // 保存新的房间ID
-//                pendingRoomId = messageEvent.getText().getRoom_id();
-//
-//                // 创建新的延迟任务
-//                roomSwitchRunnable = new Runnable() {
-//                    @Override
-//                    public void run() {
-//                        // 确保 Activity 仍然有效
-//                        if (!isFinishing() && !isDestroyed()) {
-//                            // 防止重复切换到同一个房间
-//                            if (!pendingRoomId.equals(lastSwitchedRoomId)) {
-//                                MvpPre.quitRoom2(messageEvent.getRoomId(), SpUtil.getUserId() + "");
-//                                MvpPre.getRoomIn(pendingRoomId, "");
-//                                lastSwitchedRoomId = pendingRoomId;
-//                                AgoraManager.getInstance(context).setLastRoomId(messageEvent.getRoomId());
-//                            }
-//                        }
-//                        pendingRoomId = null;
-//                    }
-//                };
-//
-//                // 延迟3秒执行
-//                roomSwitchHandler.postDelayed(roomSwitchRunnable, 3000);
-//            }
-//
-//        } else if (messageEvent.getMsgType() == 1052) {
-//            roomFragment.upCabinFragment(messageEvent.getText().getTime_day());
-//
-//        } else if (messageEvent.getMsgType() == 1053) {//交友=麦位发生改变
-//            if (messageEvent.getText().getList() != null && !messageEvent.getText().getList().isEmpty()) {
-//                List<RoomPitBean> pitArr = new ArrayList<>();
-//                for (int j = 0; j < messageEvent.getText().getList().size(); j++) {
-//                    RoomPitBean roomPitBean = getRoomPitBean(messageEvent, j);
-//                    pitArr.add(roomPitBean);
-//                }
-//                roomFragment.friendSeatDidChanged(pitArr);
-//                pitArr.clear();
-//            }
-//        } else if (messageEvent.getMsgType() == 1054) {//交友心动值发生变化
-//
-//            // 方式2：直接传递，依赖垃圾回收
-//            roomFragment.friendHeartNumberDidChanged(
-//                    messageEvent.getText().getList().stream()
-//                            .map(item -> {
-//                                FriendInfo.HeartList heartList1 = new FriendInfo.HeartList();
-//                                heartList1.setHeartId(item.getHeartId());
-//                                heartList1.setHeartNum(item.getHeartNum());
-//                                return heartList1;
-//                            })
-//                            .collect(Collectors.toList())
-//            );
-//        } else if (messageEvent.getMsgType() == 1055) {
-//            if (!isFinishing() && !isDestroyed()) {
-//                // 防止重复切换到同一个房间
-//                MvpPre.quitRoom2(messageEvent.getRoomId(), SpUtil.getUserId() + "");
-//                jiaR();
-////                MvpPre.getRoomIn(AgoraManager.getInstance(context).getLastRoomId(), "");
-////                AgoraManager.getInstance(context).setLastRoomId("");
-//            }
-//        } else if (messageEvent.getMsgType() == 1035) {
-//            if (mRoomInfoResp.getRoom_info().getType_id().equals("2")) {
-//                roomFragment.handleAuctionMessageEvent(messageEvent);
-//            }else if (mRoomInfoResp.getRoom_info().getType_id().equals("1") || mRoomInfoResp.getRoom_info().getType_id().equals("3") || mRoomInfoResp.getRoom_info().getType_id().equals("4")){
-//                if (mRoomInfoResp.getRoom_info().getLabel_id().equals("2")){
-//                    roomFragment.KtvFragmentEvent(messageEvent);
-//                }else {
-//                    for (RoomPitBean pitBean : mRoomInfoResp.getRoom_info().getPit_list()) {
-//                        if (pitBean.getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
-//                            pitBean.setCharm(messageEvent.getText().getFromUserInfo().getCharm());
-//                            pitBean.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
-//                            pitBean.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
-//                            pitBean.setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
-//                            pitBean.setDress(messageEvent.getText().getFromUserInfo().getDress());
-//                        }
-//                    }
-//                }
-//            }else {
-//                for (RoomPitBean pitBean : mRoomInfoResp.getRoom_info().getPit_list()) {
-//                    if (pitBean.getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
-//                        pitBean.setCharm(messageEvent.getText().getFromUserInfo().getCharm());
-//                        pitBean.setAvatar(messageEvent.getText().getFromUserInfo().getAvatar());
-//                        pitBean.setNickname(messageEvent.getText().getFromUserInfo().getNickname());
-//                        pitBean.setSex(messageEvent.getText().getFromUserInfo().getSex() + "");
-//                        pitBean.setDress(messageEvent.getText().getFromUserInfo().getDress());
-//                    }
-//                }
-//            }
-//            roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
-//        }else if (messageEvent.getMsgType()==1030){
-//            roomFragment.SingSongEvent(messageEvent);
-//        }else if (messageEvent.getMsgType()==1031){
-//            roomFragment.SingSongEvent(messageEvent);
-//        }else if (messageEvent.getMsgType()==1032){
-//            roomFragment.SingSongEvent(messageEvent);
-//            setRoleType(3, -11);
-//        }else if (messageEvent.getMsgType()==1033){
-//            roomFragment.SingSongEvent(messageEvent);
-//            setRoleType(3, -11);
-//        }else if (messageEvent.getMsgType()==1015){
-//            roomFragment.SingSongEvent(messageEvent);
-//        }else if (messageEvent.getMsgType()==125){///关闭对方麦克风
-//            RoomMessageEvent.text text = com.blankj.utilcode.util.GsonUtils.fromJson(messageEvent.getText().getText(), RoomMessageEvent.text.class);
-//            if (text.getIs_mute() == 1) {
-//                AgoraManager.getInstance(this).ClientRole(false);
-//                AgoraManager.getInstance(this).muteLocalAudioStreamEx(false, SpUtil.getUserId());
-//            } else {
-//                AgoraManager.getInstance(this).ClientRole(true);
-//                AgoraManager.getInstance(this).muteLocalAudioStreamEx(true, SpUtil.getUserId());
-//
-//            }
-//        }else if (messageEvent.getMsgType()==1007){
-//            mRoomInfoResp.getUser_info().setIs_host(1);
-//            roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
-//        } else if (messageEvent.getMsgType() == 1018) {
-//            mRoomInfoResp.getUser_info().setIs_host(0);
-//            roomFragment.updateSeatViewExchangedWithPitArray(mRoomInfoResp);
-//        }else if (messageEvent.getMsgType() == 126) {
-//            AgoraManager.getInstance(this).setLocalAudioEnabled(false, messageEvent.getText().getFromUserInfo().getUser_id() + "");
-//        }else if (messageEvent.getMsgType()==1037){
-//            roomFragment.SingSongEvent(messageEvent);
-//        }else  if (messageEvent.getMsgType() == 1034) {
-//            int count = messageEvent.getText().getCount();
-//            if (count == 0) {
-//               tvFirst(new SpannableStringBuilder("0人排队"));
-//                return;
-//            }
-//            String countText = String.valueOf(count);
-//            String fullText = countText + "人排队";
-//
-//            SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(fullText);
-//            spannableStringBuilder.setSpan(
-//                    new ForegroundColorSpan(ContextCompat.getColor(this, com.xscm.moduleutil.R.color.colorPrimary)), // 设置颜色为红色
-//                    0, // 起始位置
-//                    countText.length(), // 结束位置
-//                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
-//            );
-//            tvFirst(spannableStringBuilder);
-//        } else if (messageEvent.getMsgType() == 1016) {
-//            if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
-//                if (messageEvent.getText().getIs_mute_pit() == 1) {
-//                  switchMic(2);
-//                }
-//                mRoomInfoResp.getUser_info().setIs_mute_pit(String.valueOf(messageEvent.getText().getIs_mute_pit()));
-//                mRoomInfoResp.getUser_info().setIs_mute(String.valueOf(messageEvent.getText().getIs_mute()));
-//            }
-//        }
-//
-//    }
-
     // TODO: 2025/6/30 上麦，麦位变化
     private RoomPitBean getPitBean(RoomMessageEvent messageEvent) {
         RoomPitBean pitBean = new RoomPitBean();
@@ -1984,7 +1772,6 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
      */
     //    @Override
     public void switchMic(int type) {
-//        mRoomInfoResp.getUser_info().setVoice(type);
         if (type == 1) {
             mBinding.ivMic.setImageResource(com.xscm.moduleutil.R.mipmap.room_microphone);
             AgoraManager.getInstance(this).setLocalAudioEnabled(true, SpUtil.getUserId() + "");
@@ -1994,15 +1781,11 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
         } else {
             mBinding.ivMic.setImageResource(com.xscm.moduleutil.R.mipmap.room_microphone_off);
             AgoraManager.getInstance(this).setLocalAudioEnabled(false, SpUtil.getUserId() + "");
-//            AgoraManager.getInstance(getActivity()).muteLocalAudioStream(false);
-//            AgoraManager.getInstance(getActivity()).ClientRole( false);
             isSwith = true;
-//            AgoraManager.getInstance(getActivity()).muteLocalAudioStream(true);
-//            AgoraManager.getInstance(getActivity()).setLocalAudioEnabled( false);
             isMute(1);
 
-
         }
+
     }
 
     /// 进入小黑屋将所有的底部隐藏
@@ -2057,52 +1840,37 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
         RelativeLayout rl_more = mBinding.rlMore;
         RelativeLayout rl_misc = mBinding.rlMisc;
 
-
         // 默认隐藏所有按钮
-        rl_voive.setVisibility(View.GONE);//声音
-        rl_more.setVisibility(View.GONE);//PK
-        rl_misc.setVisibility(View.GONE); //音乐
-        rl_mic.setVisibility(View.GONE); // 麦克风
-        //根据角色类型显示按钮
+        rl_voive.setVisibility(View.GONE);
+        rl_more.setVisibility(View.GONE);
+        rl_misc.setVisibility(View.GONE);
+        rl_mic.setVisibility(View.GONE);
+
+        // 根据角色类型显示按钮
         switch (roleType) {
             case 2: // 主持人
-                rl_voive.setVisibility(View.VISIBLE);
-                rl_mic.setVisibility(pit_number != 0 ? View.VISIBLE : View.GONE);
-                rl_more.setVisibility((pit_number == 9 && pit_number != -11) ? View.VISIBLE : View.GONE);
-                rl_misc.setVisibility(View.VISIBLE);
-                break;
-
             case 1: // 房主
+            case 3: // 麦上用户
                 rl_voive.setVisibility(View.VISIBLE);
                 rl_mic.setVisibility(pit_number != 0 ? View.VISIBLE : View.GONE);
-                rl_more.setVisibility((pit_number == 9 && pit_number != -11) ? View.VISIBLE : View.GONE);
+                rl_more.setVisibility(pit_number == 9 ? View.VISIBLE : View.GONE);
                 rl_misc.setVisibility(View.VISIBLE);
                 break;
-
-            case 3://麦上用户
-                rl_voive.setVisibility(View.VISIBLE);
-                rl_mic.setVisibility(pit_number != 0 ? View.VISIBLE : View.GONE);
-                rl_more.setVisibility((pit_number == 9 && pit_number != -11) ? View.VISIBLE : View.GONE);
-                rl_misc.setVisibility(View.VISIBLE);
-                break;
-
             case 0: // 观众
                 rl_voive.setVisibility(View.VISIBLE);
                 rl_mic.setVisibility(pit_number != 0 ? View.VISIBLE : View.GONE);
                 rl_misc.setVisibility(View.VISIBLE);
                 break;
-
             case 5: // 房间管理员
                 rl_voive.setVisibility(View.VISIBLE);
-                rl_more.setVisibility(View.GONE);//PK
-                rl_misc.setVisibility(View.GONE); //音乐
+                rl_more.setVisibility(View.GONE);
+                rl_misc.setVisibility(View.GONE);
                 break;
-
             default:
                 break;
         }
 
-        if (mRoomInfoResp.getRoom_info().getType_id().equals("2")) {
+        if ("2".equals(mRoomInfoResp.getRoom_info().getType_id())) {
             rl_misc.setVisibility(View.GONE);
             rl_more.setVisibility(View.GONE);
         } else if (roleType != 5) {
@@ -2111,15 +1879,19 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
                 rl_more.setVisibility(View.VISIBLE);
             }
         }
-        if ((mRoomInfoResp.getRoom_info().getType_id().equals("1") || mRoomInfoResp.getRoom_info().getType_id().equals("4") || mRoomInfoResp.getRoom_info().getType_id().equals("3")) && mRoomInfoResp.getRoom_info().getLabel_id().equals("2")) {
+
+        if (("1".equals(mRoomInfoResp.getRoom_info().getType_id()) ||
+                "4".equals(mRoomInfoResp.getRoom_info().getType_id()) ||
+                "3".equals(mRoomInfoResp.getRoom_info().getType_id())) &&
+                "2".equals(mRoomInfoResp.getRoom_info().getLabel_id())) {
             rl_more.setVisibility(View.GONE);
         }
+
         if (mRoomInfoResp.getUser_info().getPit_number() > 0) {
             rl_mic.setVisibility(View.VISIBLE);
             switchMic(2);
         } else {
             if (pit_number == 888) {
-
                 rl_mic.setVisibility(View.VISIBLE);
                 switchMic(2);
             } else {
@@ -2128,29 +1900,16 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
             }
         }
 
-//        if (roleType == 5 ){
-//            rl_misc.setVisibility(View.GONE);
-//            rl_more.setVisibility(View.GONE);
-//        }
-
-//        for (int i = 0; i < mRoomInfoResp.getRoom_info().getPit_list().size(); i++) {
-//            if (mRoomInfoResp.getRoom_info().getPit_list().get(i).getUser_id().equals(SpUtil.getUserId() + "")) {
-//                rl_mic.setVisibility(View.VISIBLE);
-//            }
-//        }
-
-        if (mRoomInfoResp.getRoom_info().getType_id().equals("6")) {
-            rl_voive.setVisibility(View.GONE);//声音
-            rl_more.setVisibility(View.GONE);//PK
-            rl_misc.setVisibility(View.GONE); //音乐
-            rl_mic.setVisibility(View.GONE); // 麦克风
+        if ("6".equals(mRoomInfoResp.getRoom_info().getType_id())) {
+            rl_voive.setVisibility(View.GONE);
+            rl_more.setVisibility(View.GONE);
+            rl_misc.setVisibility(View.GONE);
+            rl_mic.setVisibility(View.GONE);
             mBinding.rlMessage.setVisibility(View.GONE);
-        } else if (mRoomInfoResp.getRoom_info().getType_id().equals("7")) {
-            rl_more.setVisibility(View.GONE);//PK
-            rl_misc.setVisibility(View.GONE); //音乐
+        } else if ("7".equals(mRoomInfoResp.getRoom_info().getType_id())) {
+            rl_more.setVisibility(View.GONE);
+            rl_misc.setVisibility(View.GONE);
         }
-
-
     }
 
     public void isMute(int is_mute) {
@@ -2165,8 +1924,8 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
         // 转换为 byte[]
         byte[] binaryData = json.getBytes(StandardCharsets.UTF_8);
         // 创建自定义消息
-        MessageListenerSingleton.getInstance().sendCustomC2CMessage(
-                SpUtil.getUserInfo().getUser_id() + "",
+        MessageListenerSingleton.getInstance().sendCustomRoomMessage(
+                roomId + "",
                 binaryData
         );
     }
@@ -2406,6 +2165,59 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
         if (publicScreenFragment != null) {
             publicScreenFragment.getUpRoomInfo(resp);
         }
+        instView();
+    }
+
+    private void instView() {//隐藏视图
+
+        if (mRoomInfoResp.getUser_info().getPit_number() != 0) {
+            aBoolean = false;
+            ivWheatFeeding(com.xscm.moduleutil.R.mipmap.room_wheat_feeding_up);
+            setrlMic(true);
+            setBoolean(aBoolean);
+        } else {
+            aBoolean = true;
+            ivWheatFeeding(com.xscm.moduleutil.R.mipmap.room_wheat_feeding);
+            setrlMic(false);
+            setBoolean(aBoolean);
+        }
+        int pitNumber = mRoomInfoResp.getUser_info().getPit_number();
+        int roleType;
+
+        if (pitNumber == 9) {
+            roleType = mRoomInfoResp.getUser_info().getIs_room_owner() != 0 ? 1 :
+                    mRoomInfoResp.getUser_info().getIs_host() != 0 ? 2 : 0;
+        } else if (pitNumber != 0 && pitNumber != 9) {
+            roleType = 3;
+        } else {
+            roleType = 0;
+        }
+        if (mRoomInfoResp.getUser_info().getPit_number() == 9) {
+            ivSoundEffects(true);
+        } else {
+            ivSoundEffects(false);
+        }
+//        }
+        if (mRoomInfoResp.getUser_info().getUser_id().equals(SpUtil.getUserId() + "") && mRoomInfoResp.getUser_info().getPit_number() == 9
+                && !mRoomInfoResp.getRoom_info().getType_id().equals("2") && !mRoomInfoResp.getRoom_info().getType_id().equals("6")) {
+            rlMore(true);
+
+        } else {
+            rlMore(false);
+        }
+        String countText = String.valueOf(mRoomInfoResp.getRoom_info().getQueue_number());
+        String fullText = countText + "人排队";
+
+        SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(fullText);
+        spannableStringBuilder.setSpan(
+                new ForegroundColorSpan(ContextCompat.getColor(this, com.xscm.moduleutil.R.color.colorPrimary)), // 设置颜色为红色
+                0, // 起始位置
+                countText.length(), // 结束位置
+                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+        );
+
+        tvFirst(spannableStringBuilder);
+        setRoleType(roleType, pitNumber);
     }
 
     private static final long CLICK_DELAY = 500; // 延迟时间，单位毫秒
@@ -2417,80 +2229,45 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
     public void toutiao() {
         if (mRoomInfoResp.getRoom_info().getHead_line() != null) {
             mBinding.flaoatZuoji.setVisibility(VISIBLE);
-            // 设置 OnTouchListener，强制悬浮框自己处理拖动
 
             ImageUtils.loadHeadCC(mRoomInfoResp.getRoom_info().getHead_line().getAvatar(), mBinding.headAvate);
             mBinding.headName.setText(mRoomInfoResp.getRoom_info().getHead_line().getNickname());
             mBinding.headCone.setText(mRoomInfoResp.getRoom_info().getHead_line().getContent());
-//            mBinding.cc.setOnClickListener(v -> {
-//                mBinding.flaoatZuoji.setVisibility(GONE);
-//            });
 
-            mBinding.ivQuanQiang.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    PublishCommentDialogFragment.show(roomId, getSupportFragmentManager());
+            mBinding.ivQuanQiang.setOnClickListener(v -> PublishCommentDialogFragment.show(roomId, getSupportFragmentManager()));
+            mBinding.ivQuanC.setOnClickListener(v -> ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS)
+                    .withString("from", "我的界面")
+                    .withString("roomId", mRoomInfoResp.getRoom_info().getHead_line().getRoom_id())
+                    .navigation());
+
+            mBinding.imYc.setOnClickListener(v -> {
+                if (imYc) {
+                    mBinding.cl.setVisibility(VISIBLE);
+                    imYc = false;
+                } else {
+                    mBinding.cl.setVisibility(GONE);
+                    imYc = true;
                 }
             });
 
-            mBinding.ivQuanC.setOnClickListener(new View.OnClickListener() {//这是跟随的意思
-
-                @Override
-                public void onClick(View v) {
-                    ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS).withString("from", "我的界面").withString("roomId", mRoomInfoResp.getRoom_info().getHead_line().getRoom_id()).navigation();
-                }
-            });
-
-            mBinding.imYc.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (imYc) {
-                        mBinding.cl.setVisibility(VISIBLE);
-                        imYc = false;
-                    } else {
-                        mBinding.cl.setVisibility(GONE);
-                        imYc = true;
-                    }
-                }
-            });
-            mBinding.imHq.setOnClickListener(new View.OnClickListener() {
-
-                @Override
-                public void onClick(View v) {
-                    if (!imYc) {
-                        mBinding.cl.setVisibility(VISIBLE);
-                        imYc = true;
-                    } else {
-                        mBinding.cl.setVisibility(GONE);
-                        imYc = false;
-                    }
-                }
-            });
-
-            mBinding.imHq.setOnTouchListener(new View.OnTouchListener() {
-
-                @Override
-                public boolean onTouch(View view, MotionEvent motionEvent) {
-
-
-//                    // 优先处理悬浮框的触摸事件
-                    if (mBinding.flaoatZuoji.onTouchEvent(motionEvent)) {
-                        return true;
-                    }
-                    // 如果悬浮框的触摸事件未处理，则处理自身的触摸事件
-                    return view.onTouchEvent(motionEvent);
+            mBinding.imHq.setOnClickListener(v -> {
+                if (!imYc) {
+                    mBinding.cl.setVisibility(VISIBLE);
+                    imYc = true;
+                } else {
+                    mBinding.cl.setVisibility(GONE);
+                    imYc = false;
                 }
             });
 
             final GestureDetector gestureDetector = new GestureDetector(context, new GestureDetector.SimpleOnGestureListener() {
                 @Override
                 public boolean onDown(MotionEvent e) {
-                    return true; // 必须返回true以便onShowPress和onSingleTapUp被调用
+                    return true;
                 }
 
                 @Override
                 public boolean onSingleTapUp(MotionEvent e) {
-                    // 处理点击事件
                     if (!imYc) {
                         mBinding.cl.setVisibility(VISIBLE);
                         imYc = true;
@@ -2498,40 +2275,24 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
                         mBinding.cl.setVisibility(GONE);
                         imYc = false;
                     }
-                    return true; // 消费事件
+                    return true;
                 }
 
                 @Override
                 public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
-                    // 处理滑动事件
-                    mBinding.flaoatZuoji.onTouchEvent(e2); // 直接传递滑动事件给目标视图
-                    return true; // 消费事件，防止父视图处理滑动事件
-                }
-            });
-
-            mBinding.imHq.setOnTouchListener(new View.OnTouchListener() {
-                @Override
-                public boolean onTouch(View v, MotionEvent event) {
-                    return gestureDetector.onTouchEvent(event); // 让GestureDetector处理触摸事件
-                }
-            });
-
-            mBinding.headAvate.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-
+                    mBinding.flaoatZuoji.onTouchEvent(e2);
+                    return true;
                 }
             });
 
+            mBinding.imHq.setOnTouchListener((v, event) -> gestureDetector.onTouchEvent(event));
 
             silentCountDownTimer = new SilentCountDownTimer();
             silentCountDownTimer.setOnCountDownFinishListener(() -> {
-                // 倒计时结束后的操作
                 Log.d("CountDown", "倒计时结束，执行清理或通知操作");
                 hideSomeViewOrDoSomething();
             });
 
-            // 启动倒计时（例如：目标时间戳 1752661716）
             silentCountDownTimer.start(Long.parseLong(mRoomInfoResp.getRoom_info().getHead_line().getEnd_time()));
         } else {
             mBinding.flaoatZuoji.setVisibility(GONE);
@@ -2745,7 +2506,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
             if (onlineBean.getOff_pit().size() > 0) {
                 onlineBeans.addAll(onlineBean.getOff_pit());
             }
-            likeUserAdapter.setNewData(onlineBeans.subList(0, onlineBeans.size() > 5 ? 5 : onlineBeans.size()));
+            likeUserAdapter.setNewData(onlineBeans.subList(0, onlineBeans.size() > 3 ? 3 : onlineBeans.size()));
         }
     }
 
@@ -2963,6 +2724,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
                     MvpPre.agreeSong(roomId, "2");
                 }, true, 10).show();
     }
+
     @Override
     protected void onDestroy() {
         // 清理所有可能的内存泄漏点
@@ -2973,6 +2735,7 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
 
         // 标记 Activity 已经销毁
         sDestroied = true;
+        overridePendingTransition(0, 0);
     }
 
     private void cleanupResources() {
@@ -3080,191 +2843,12 @@ public class RoomActivity extends BaseMvpActivity<RoomPresenter, ActivityRoomBin
         }
     }
 
-
-//    @Override
-//    protected void onDestroy() {
-//
-//        // 移除 EventBus 注册
-//        if (EventBus.getDefault().isRegistered(this)) {
-//            EventBus.getDefault().unregister(this);
-//        }
-//
-//        // 2. 销毁 AgoraManager（RTC 引擎）
-//        try {
-//            AgoraManager.getInstance(this).cleanup();
-//        } catch (Exception e) {
-//            LogUtils.e("AgoraManager destroy error: " + e.getMessage());
-//        }
-//
-//        destroyAllFragments();
-//        // 清理消息监听器
-//        MessageListenerSingleton.reset(roomId);
-//        // 释放所有 AvatarFrameView 实例
-////        releaseAllAvatarFrameViews();
-//        // 释放 Agora 资源
-////        AgoraManager.getInstance(this).destroy();
-//
-//        // 销毁自定义音乐悬浮窗
-//        if (customMusicFloatingView != null) {
-//            customMusicFloatingView.destroy();
-//            customMusicFloatingView = null;
-//        }
-//
-//        // 释放悬浮窗控制资源
-//        if (musicWindowControl != null) {
-//            musicWindowControl.cancel();
-//            musicWindowControl = null;
-//        }
-//
-//        // 释放自定义悬浮窗资源
-//        if (floatingMagnetView != null) {
-//            floatingMagnetView.removeAllViews();
-//            floatingMagnetView = null;
-//        }
-//
-//        // 释放全屏相关资源
-//        if (fullScreenContainer != null) {
-//            fullScreenContainer.removeAllViews();
-//            fullScreenContainer = null;
-//        }
-//
-//        // 释放倒计时资源
-//        if (silentCountDownTimer != null) {
-//            silentCountDownTimer.release();
-//            silentCountDownTimer = null;
-//        }
-//
-//        // 清理礼物相关资源
-//        hideGiftGiveProgress();
-//        if (giftCountTimer != null) {
-//            giftCountTimer.cancel();
-//            giftCountTimer = null;
-//        }
-//        giftGiveEvent = null;
-//
-//        // 清理房间Fragment
-//        if (roomFragment != null) {
-//            getSupportFragmentManager().beginTransaction().remove(roomFragment).commitAllowingStateLoss();
-//            roomFragment = null;
-//        }
-//
-//        // 清理适配器资源
-//        if (likeUserAdapter != null) {
-//            likeUserAdapter.setOnItemClickListener(null);
-//            likeUserAdapter.setNewData(null);
-//            likeUserAdapter = null;
-//        }
-//
-//        // 清理绑定的视图引用
-//        if (mBinding != null) {
-//            mBinding.roomTop.userRecyclerView.setAdapter(null);
-//            // 清理其他可能的视图引用
-//            mBinding = null;
-//        }
-//
-//        // 重置全局状态
-//        CommonAppContext.getInstance().isPlaying = false;
-//        CommonAppContext.getInstance().isShow = false;
-//        CommonAppContext.getInstance().playId = null;
-//        CommonAppContext.getInstance().playName = null;
-//        CommonAppContext.getInstance().playCover = null;
-//
-//        // 清理静态变量
-//        sDestroied = true;
-//        SpUtil.setMusicName("");
-//
-//        // 清理房间相关信息
-//        mRoomBean = null;
-//        mRoomOwnerBean = null;
-//        mRoomUserBean = null;
-//        mRoomInfoResp = null;
-//        mPitList.clear();
-//        mPitList = null;
-//
-//        // 清理全屏相关视图引用
-//        ivQuan = null;
-//        ivExitFullscreen = null;
-//        // 清理 Handler 回调
-//        if (roomSwitchHandler != null && roomSwitchRunnable != null) {
-//            roomSwitchHandler.removeCallbacks(roomSwitchRunnable);
-//            roomSwitchRunnable = null;
-//        }
-//
-//
-//        /// 清理礼物播放
-//
-//        // 如果是保存状态则finish
-//        if (isSave) {
-//            finish();
-//        }
-//
-//        super.onDestroy();
-//    }
-
-    /**
-     * 释放所有 AvatarFrameView 实例
-     */
-    private void releaseAllAvatarFrameViews() {
-        try {
-            // 释放 svgaGift
-            if (mBinding != null && mBinding.svgaGift != null) {
-                mBinding.svgaGift.release();
-            }
-
-            // 释放 svgaZuoji
-            if (mBinding != null && mBinding.svgaZuoji != null) {
-                mBinding.svgaZuoji.release();
-            }
-
-            // 释放其他可能的 AvatarFrameView 实例
-            // 如果你知道其他 AvatarFrameView 的引用，也需要在这里释放
-        } catch (Exception e) {
-            LogUtils.e("releaseAllAvatarFrameViews error: " + e.getMessage());
-        }
-    }
-
-    /**
-     * 销毁所有子Fragment
-     */
-    private void destroyAllFragments() {
-        try {
-            // 获取FragmentManager
-            androidx.fragment.app.FragmentManager fragmentManager = getSupportFragmentManager();
-
-            // 获取所有已添加的Fragment
-            List<Fragment> fragments = fragmentManager.getFragments();
-
-            if (!fragments.isEmpty()) {
-                // 开始Fragment事务
-                androidx.fragment.app.FragmentTransaction transaction = fragmentManager.beginTransaction();
-
-                // 遍历所有Fragment并移除
-                for (Fragment fragment : fragments) {
-                    if (fragment != null) {
-                        // 移除Fragment
-                        transaction.remove(fragment);
-                    }
-                }
-
-                // 提交事务
-                transaction.commitAllowingStateLoss();
-            }
-
-            // 强制执行挂起的事务
-            fragmentManager.executePendingTransactions();
-
-        } catch (Exception e) {
-            LogUtils.e("destroyAllFragments error: " + e.getMessage());
-        }
-    }
-
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         isSave = true;
     }
 
-
     private static final String[] AUDIO_PERMISSIONS = {Manifest.permission.RECORD_AUDIO};
 
     private void requestAudioPermission() {
diff --git a/moduleroom/src/main/java/com/example/moduleroom/adapter/WheatFeedingSelectAdapter.java b/moduleroom/src/main/java/com/example/moduleroom/adapter/WheatFeedingSelectAdapter.java
index 1ffb3d1..269c0ec 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/adapter/WheatFeedingSelectAdapter.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/adapter/WheatFeedingSelectAdapter.java
@@ -56,7 +56,7 @@ public class WheatFeedingSelectAdapter  extends RecyclerView.Adapter<WheatFeedin
             if (newState) {
                 mSelectedPositions.add(position);
             } else {
-                mSelectedPositions.remove(position);
+                mSelectedPositions.remove(Integer.valueOf(position)); // 修改这里
             }
         });
         holder.tv_bm.setOnClickListener(v -> {
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomConcernDialogFragment.java b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomConcernDialogFragment.java
index d942e97..cf7d779 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomConcernDialogFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomConcernDialogFragment.java
@@ -75,7 +75,6 @@ public class RoomConcernDialogFragment extends BaseMvpDialogFragment<RoomClosePr
         window.setAttributes(lp);
         window.addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
     }
-
     @Override
     public void initView() {
 //        getWindow().setLayout((int) (ScreenUtils.getScreenWidth() / 375.0 * 341), RadioGroup.LayoutParams.WRAP_CONTENT);
@@ -86,7 +85,7 @@ public class RoomConcernDialogFragment extends BaseMvpDialogFragment<RoomClosePr
         mBinding.tvName2.setText(relationshipList.getUser2_nickname());
         mBinding.tvZhi.setText(relationshipList.getHeart_value());
         mBinding.btnAction.setOnClickListener(this::onViewClicked);
-        mBinding.btnCancel.setOnClickListener(this::onViewClicked);
+//        mBinding.btnCancel.setOnClickListener(this::onViewClicked);
         mBinding.rlList.setLayoutManager(new GridLayoutManager(getContext(), 3));
         mAdapter = new BaseQuickAdapter<RoomRelationBean, BaseViewHolder>(R.layout.room_concern_item) {
             @Override
@@ -98,8 +97,10 @@ public class RoomConcernDialogFragment extends BaseMvpDialogFragment<RoomClosePr
                 // 根据当前选中的位置来设置颜色
                 if (helper.getAdapterPosition() == selectedPosition) {
                     tvRelation.setSelected(true);
+                    tvRelation.setTextColor(getResources().getColor(com.xscm.moduleutil.R.color.white));
                 } else {
                     tvRelation.setSelected(false);
+                    tvRelation.setTextColor(getResources().getColor(com.xscm.moduleutil.R.color.black));
                 }
 
                 // 设置点击事件
@@ -145,6 +146,7 @@ public class RoomConcernDialogFragment extends BaseMvpDialogFragment<RoomClosePr
             if (listener != null && selectedPosition != -1) {
                 RoomRelationBean selectedDean = mAdapter.getItem(selectedPosition);
                 listener.onConcernSelected(selectedDean, relationshipList);
+                dismiss();
             }else {
                 ToastUtils.show("请选择关系");
                 return;
@@ -152,9 +154,10 @@ public class RoomConcernDialogFragment extends BaseMvpDialogFragment<RoomClosePr
 
 
 
-        } else if (view.getId() == R.id.btn_cancel) {//取消
-            dismiss();
         }
+//        else if (view.getId() == R.id.btn_cancel) {//取消
+//            dismiss();
+//        }
     }
 
     public void dismiss() {
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomGiftDialogFragment.java b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomGiftDialogFragment.java
index 279f656..eb35ba7 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomGiftDialogFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomGiftDialogFragment.java
@@ -358,45 +358,33 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void userRefresh(GiftUserRefreshEvent event) {
-        if (event.gift==null||event.gift.getRule() == null) {
+        if (event.gift == null || event.gift.getRule() == null) {
             mBinding.llGiftRule.setVisibility(View.GONE);
         } else {
             if (event.gift.getActivities_id() == 5) {
-                this.dismiss();
+
                 showGiftLotteryDialog(event.gift, roomId);
                 return;
-//                String userId = gifyuseradapter.getUserIdToString();
-//                if (userId == null || userId.isEmpty()) {
-//                    ToastUtils.show("请先选择人员");
-//                    return;
-//                } else {
-//                    // 直接链式调用显示对话框
-//                    GiftLotteryDialog.newInstance(event.gift.getGift_bag()+"", roomId, userId)
-//                            .show(getChildFragmentManager(), "GiftLotteryDialog");
-//                    return;
-//                }
             }
             mBinding.llGiftRule.setVisibility(View.VISIBLE);
             setGiftDetail(event.gift);
         }
-//        if (event.gift.isManghe()){
-//            mBinding.llGiftRule.setVisibility(View.VISIBLE);
-//            setGiftDetail(event.gift);
-//        }else {
-//            mBinding.llGiftRule.setVisibility(View.GONE);
-//        }
         roonGiftModel = event.gift;
     }
+
     private GiftLotteryDialog currentDialog;
+
     private void showGiftLotteryDialog(RoonGiftModel gift, String roomId) {
         String userId = gifyuseradapter.getUserIdToString();
         if (userId == null || userId.isEmpty()) {
             ToastUtils.show("请先选择人员");
+            gift.setChecked(false);
+
             return;
         }
-
+        this.dismiss();
         FragmentManager fm = getParentFragmentManager();
-        GiftLotteryDialog newDialog = GiftLotteryDialog.newInstance(gift.getGift_bag()+"", roomId, userId);
+        GiftLotteryDialog newDialog = GiftLotteryDialog.newInstance(gift.getGift_bag() + "", roomId, userId);
         newDialog.show(fm, "GiftLotteryDialog");
 
         fm.beginTransaction()
@@ -405,7 +393,6 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
                 .commit();
 
 
-
         // 如果当前dialog存在且正在显示，先关闭
 //        if (currentDialog != null && currentDialog.isVisible()) {
 //            currentDialog.dismiss();
@@ -500,20 +487,26 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
         if (currentItem != 0) {
             //礼物打赏
             giftNumber = num;
-            roomGiftGiveEvent = new RoomGiftGiveEvent(userId, roomId, pit, num, 0, null, roonGiftModel, heart_id);
+
             if (userInfo != null) {
                 if (userInfo.getPit_number() != null) {
                     if (userInfo.getPit_number().equals("888") || userInfo.getPit_number().equals("")) {
                         if (userInfo.getPit_number().isEmpty() || jingp != 1) {
+                            roomGiftGiveEvent = new RoomGiftGiveEvent(userId, roomId, pit, num, 0, null, roonGiftModel, heart_id, "");
                             MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, "");
                         } else {
+                            roomGiftGiveEvent = new RoomGiftGiveEvent(userId, roomId, pit, num, 0, null, roonGiftModel, heart_id, userInfo.getAuction_id());
+                            EventBus.getDefault().post(roomGiftGiveEvent);
+                            roomGiftGiveEvent = null;
                             MvpPre.roomAuctionJoin(userInfo.getAuction_id(), userInfo.getUser_id() + "", roonGiftModel.getGift_id(), num, "1");
                             dismiss();
                         }
                     } else {
+                        roomGiftGiveEvent = new RoomGiftGiveEvent(userId, roomId, pit, num, 0, null, roonGiftModel, heart_id, "");
                         MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, heart_id);
                     }
                 } else {
+                    roomGiftGiveEvent = new RoomGiftGiveEvent(userId, roomId, pit, num, 0, null, roonGiftModel, heart_id, "");
                     MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, "");
                 }
             } else {
@@ -522,6 +515,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
                 } else {
                     MvpPre.roomGift(roomId, roonGiftModel.getGift_id(), giftNumber, userId, "1", pit, "");
                 }
+                roomGiftGiveEvent = new RoomGiftGiveEvent(userId, roomId, pit, num, 0, null, roonGiftModel, heart_id, "");
             }
         } else if (currentItem == 0) {
 //            if (all) {
@@ -565,7 +559,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
         giftLabelBean.setId("0");
         giftLabelBean.setName("背包");
         giftLabelBeans.add(0, giftLabelBean);
-        mBinding.viewPager.setAdapter(new MyFragmentPagerAdapter(getChildFragmentManager(), giftLabelBeans, fragmentList,roomId));
+        mBinding.viewPager.setAdapter(new MyFragmentPagerAdapter(getChildFragmentManager(), giftLabelBeans, fragmentList, roomId));
         mBinding.viewPager.setOffscreenPageLimit(0);
         mBinding.slidingTabLayout.setViewPager(mBinding.viewPager);
         mBinding.slidingTabLayout.setCurrentTab(1);
@@ -600,6 +594,11 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
     @Override
     public void roomAuctionJoin(RoomAuction.AuctionListBean auctionListBean) {
         com.blankj.utilcode.util.ToastUtils.showShort("竞拍成功");
+        if (roomGiftGiveEvent != null) {
+            EventBus.getDefault().post(roomGiftGiveEvent);
+            roomGiftGiveEvent = null;
+            dismiss();
+        }
         dismiss();
     }
 
@@ -614,7 +613,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
         private List<Fragment> fragmentList;
         private String roomId;
 
-        public MyFragmentPagerAdapter(FragmentManager fm, List<GiftLabelBean> list, List<Fragment> fragmentList,String roomId) {
+        public MyFragmentPagerAdapter(FragmentManager fm, List<GiftLabelBean> list, List<Fragment> fragmentList, String roomId) {
             super(fm);
             this.list = list;
             this.fragmentList = fragmentList;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomOnlineDialogFragment.java b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomOnlineDialogFragment.java
index ef1aaf0..d1a2f4c 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomOnlineDialogFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomOnlineDialogFragment.java
@@ -296,6 +296,7 @@ public class RoomOnlineDialogFragment extends BaseMvpDialogFragment<RoomPresente
     @Override
     public void hostUserPit() {
         ToastUtils.showShort("抱麦成功");
+        dismiss();
     }
 
     @Override
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java
index c13566d..8edd7c1 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java
@@ -18,6 +18,7 @@ import com.blankj.utilcode.util.GsonUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.example.moduleroom.R;
+import com.example.moduleroom.activity.RoomActivity;
 import com.example.moduleroom.adapter.RoomSettingAdapter;
 import com.example.moduleroom.contacts.RoomSettingContacts;
 import com.example.moduleroom.databinding.DialogRoomSettingFragmentBinding;
@@ -217,6 +218,11 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
                             roomId,
                             binaryData
                     );
+
+                    if (getActivity() instanceof RoomActivity) {
+                        ((RoomActivity) getActivity()).clearData();
+                    }
+
                 } else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomMyDress) {
                     TunerDialogFragment.show(roomId, getChildFragmentManager());
                 } else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomCompere) {//主持设置
@@ -265,6 +271,9 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
                     ARouter.getInstance().build(ARouteConstants.CREATED_ROOM).withSerializable("roomInfoResp", roomInfoResp).navigation();
                 } else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomReport) {
                     ARouter.getInstance().build(ARouteConstants.H5).withString("url", CommonAppContext.getInstance().getCurrentEnvironment().getH5Url() + "/web/index.html#/pages/feedback/report?id=" + SpUtil.getToken() + "&fromType=" + 2 + "&fromId=" + roomId).navigation();
+                }else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomSubsidy){
+                    ARouter.getInstance().build(ARouteConstants.ROOM_ALLOWANCE).withString("from", "我的界面").withString("roomId", roomInfoResp.getRoom_info().getRoom_id() + "").navigation();
+
                 }
 
             }
@@ -312,6 +321,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
         } else if (roleLevel == 2 || roleLevel == 3) {
             if (type == RoomSettingBean.QXRoomSettingTypeRoomTypeSing || type == RoomSettingBean.QXRoomSettingTypeRoomTypeAuction ||
                     type == RoomSettingBean.QXRoomSettingTypeRoomTypeBoy || type == RoomSettingBean.QXRoomSettingTypeRoomTypeGirl ||
+                    type == RoomSettingBean.QXRoomSettingTypeRoomTypeJiaoy ||
                     type == RoomSettingBean.QXRoomSettingTypeRoomClearMessage || type == QXRoomSettingTypeRoomOrderMic
                     || type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomBgImage || type == -1) {
                 if (onMic) {
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/TunerDialogFragment.java b/moduleroom/src/main/java/com/example/moduleroom/dialog/TunerDialogFragment.java
index 91901ca..fd649cc 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/TunerDialogFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/dialog/TunerDialogFragment.java
@@ -61,7 +61,7 @@ public class TunerDialogFragment extends BaseMvpDialogFragment<WheatPresenter, R
         if (window != null) {
             // 设置固定高度为 500dp
             int screenHeight = getResources().getDisplayMetrics().heightPixels;
-            int heightInDp = (int) (screenHeight * 0.4f);;
+            int heightInDp = (int) (screenHeight * 0.5f);;
 //            int heightInPx = (int) (heightInDp * getResources().getDisplayMetrics().density);
             window.setLayout(WindowManager.LayoutParams.MATCH_PARENT, heightInDp);
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/FriendshipRoomFragment.java b/moduleroom/src/main/java/com/example/moduleroom/fragment/FriendshipRoomFragment.java
index 9a91fd6..5a95c61 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/FriendshipRoomFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/fragment/FriendshipRoomFragment.java
@@ -41,6 +41,7 @@ import com.xscm.moduleutil.bean.room.FriendUserBean;
 import com.xscm.moduleutil.bean.room.RoomInfoResp;
 import com.xscm.moduleutil.bean.room.RoomPitBean;
 import com.xscm.moduleutil.color.ThemeableDrawableUtils;
+import com.xscm.moduleutil.dialog.ConfirmDialog;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.utils.SpUtil;
 import com.xscm.moduleutil.widget.RoomFriendshipWheatView;
@@ -228,6 +229,9 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
                     handleUserClick(pitBean);
                 } else {
                     if (currentPartType.value == 2 || currentPartType.value == 3){
+                        if (pitBean.getPit_number().equals("9") || pitBean.getPit_number().equals("10")){
+                            handleEmptyPitClick(wheatView, pitBean);
+                        }
                         return;
                     }
                     // 麦位空闲，可以申请上麦等操作
@@ -263,7 +267,7 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
         if (cheackWether(pitBean.getPit_number())) {
             showPopupMenu(wheatView); // v 是点击的按钮视图
         } else if (pitBean.getPit_number().equals("10")) {
-            RoomOnlineDialogFragment.show(roomId, "9", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
+            RoomOnlineDialogFragment.show(roomId, "10", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
         } else {
             MvpPre.applyPit(roomId, pitBean.getPit_number());
         }
@@ -404,7 +408,8 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
         });
 
         mBinding.tvJs.setOnClickListener(v -> {
-            MvpPre.endFriend(String.valueOf(roomInfoResp.getFriend_info().getFriend_id()), roomId);
+            queren();
+
         });
         mBinding.tvYs.setOnClickListener(v -> {
             //点击延时按钮
@@ -417,7 +422,21 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
 //        tvHand.setOnClickListener(v -> updateFriendshipState(FriendshipPartType.HAND));
 
     }
-
+    private void queren() {
+        // 创建并显示确认对话框
+        new ConfirmDialog(getActivity(),
+                "提示",
+                "是否要结束当前交友？",
+                "确认",
+                "取消",
+                v -> {
+                    // 点击“确认”按钮时执行删除操作
+                    MvpPre.endFriend(String.valueOf(roomInfoResp.getFriend_info().getFriend_id()), roomId);
+                },
+                v -> {
+                    // 点击“取消”按钮时什么都不做
+                }, false, 0).show();
+    }
 
     // TODO: 2025/8/21 交友房时间发生延时
     public void friendTimeDelayWithTime(long end_time) {
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/PublicScreenEaseChatFragment.java b/moduleroom/src/main/java/com/example/moduleroom/fragment/PublicScreenEaseChatFragment.java
index cb36cd8..bfd37f7 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/PublicScreenEaseChatFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/fragment/PublicScreenEaseChatFragment.java
@@ -500,6 +500,9 @@ public class PublicScreenEaseChatFragment extends BaseMvpFragment<PublicScreenEa
     public void handleRoomMessage(RoomMessageEvent message) {
         LogUtils.e("@@@", "handleRoomMessage: " + message);
         LogUtils.e("@@@", "handleRoomMessage: roomId" + roomId);
+        if (message.getRoomId() == null){
+            return;
+        }
         if (!message.getRoomId().contains(roomId)) {
             return;
         }
@@ -619,6 +622,14 @@ public class PublicScreenEaseChatFragment extends BaseMvpFragment<PublicScreenEa
         }else if (message.getMsgType()==1056 || message.getMsgType()==1057){
             EventBus.getDefault().post(message);
             return;
+        }else if (message.getMsgType() == 1025){
+            EventBus.getDefault().post(message);
+            return;
+        }else if (message.getMsgType() == 1039){
+            EventBus.getDefault().post(message);
+            easeChatAdapter.addData(new EMMessageInfo(message));
+            scrollToBottomIfNeed();
+            return;
         }
         EventBus.getDefault().post(message);
 //        easeChatAdapter.addData(new EMMessageInfo(message));
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomAuctionFragment.java b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomAuctionFragment.java
index 063c8f5..51e53d0 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomAuctionFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomAuctionFragment.java
@@ -109,15 +109,22 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
 //        roomInfoResp = (RoomInfoResp) getArguments().getSerializable("roomInfo");
 //        type = getArguments().getInt("type");
     }
-    ///更新数据
+
+    public void upRoomInfo(RoomInfoResp roomInfoResp) {
+        this.roomInfoResp = roomInfoResp;
+    }
+
+    /// 更新数据
     public void roomInfoUpdate(RoomInfoResp resp) {
         roomInfoResp = resp;
-        if (roomInfoResp.getRoom_info().getLabel_id().equals("1")){
-            type=1;
-        }else if (roomInfoResp.getRoom_info().getLabel_id().equals("2")){
-            type=2;
+        if (roomInfoResp.getRoom_info().getLabel_id().equals("1")) {
+            type = 1;
+        } else if (roomInfoResp.getRoom_info().getLabel_id().equals("2")) {
+            type = 2;
         }
         initOverlayButtons();
+        getTextView();
+        steView(type);
         if (getActivity() instanceof RoomActivity) {
             ((RoomActivity) getActivity()).setvisibTop(true);
         }
@@ -125,10 +132,10 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
         if (roomPitBean.getUser_id() != null && !roomPitBean.getUser_id().isEmpty() && !roomPitBean.getUser_id().equals("0")) {
             roomPitBean.setIs_pm(1);
             wheatView.setData(roomPitBean);
-
-            imActionJs.setVisibility(VISIBLE);
-        }else {
-            RoomPitBean pitBean =new RoomPitBean();
+            if (imActionJs != null)
+                imActionJs.setVisibility(VISIBLE);
+        } else {
+            RoomPitBean pitBean = new RoomPitBean();
             pitBean.setUser_id("");
             pitBean.setPit_number("9");
             pitBean.setAvatar("");
@@ -159,16 +166,21 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
                 } else {
                     if (wheatView.pitBean != null) {
                         if (wheatView.pitBean.getUser_id().equals(SpUtil.getUserId() + "")) {
-                            imActionJs.setVisibility(VISIBLE);
-                            imActionYs.setVisibility(VISIBLE);
+                            if (imActionJs != null && imActionYs != null) {
+                                imActionJs.setVisibility(VISIBLE);
+                                imActionYs.setVisibility(VISIBLE);
+                            }
                         } else {
+                            if (imActionJs != null && imActionYs != null) {
+                                imActionJs.setVisibility(INVISIBLE);
+                                imActionYs.setVisibility(INVISIBLE);
+                            }
+                        }
+                    } else {
+                        if (imActionJs != null && imActionYs != null) {
                             imActionJs.setVisibility(INVISIBLE);
                             imActionYs.setVisibility(INVISIBLE);
                         }
-                    } else {
-
-                        imActionJs.setVisibility(INVISIBLE);
-                        imActionYs.setVisibility(INVISIBLE);
                     }
                     mBinding.ivJp.setVisibility(VISIBLE);
                 }
@@ -199,15 +211,18 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
         RoomPitBean roomPitBean2 = wheatView.pitBean;
         if (roomPitBean2 != null && roomPitBean2.getUser_id() != null && !roomPitBean2.getUser_id().equals("0")) {
             if (roomPitBean2.getUser_id().equals(SpUtil.getUserId() + "")) {
-                imActionJs.setVisibility(VISIBLE);
-                imActionYs.setVisibility(VISIBLE);
+                if (imActionJs != null && imActionYs != null) {
+                    imActionJs.setVisibility(VISIBLE);
+                    imActionYs.setVisibility(VISIBLE);
+                }
             } else {
-                imActionJs.setVisibility(INVISIBLE);
-                imActionYs.setVisibility(INVISIBLE);
+                if (imActionJs != null && imActionYs != null) {
+                    imActionJs.setVisibility(INVISIBLE);
+                    imActionYs.setVisibility(INVISIBLE);
+                }
             }
         }
-        getTextView();
-        steView(type);
+
     }
 
     @Override
@@ -215,7 +230,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
         return new RoomAuctionPresenterTow(this, getActivity());
     }
 
-    ///主持上麦
+    /// 主持上麦
 
     public void initOverlayButtons() {
 //        if (isButtonsInflated) return;
@@ -314,7 +329,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
                     userInfo.setUser_id(Integer.parseInt(roomInfoResp.getRoom_auction().getAuction_user().getUser_id()));
                     userInfo.setNickname(roomInfoResp.getRoom_auction().getAuction_user().getNickname());
                     userInfo.setAvatar(roomInfoResp.getRoom_auction().getAuction_user().getAvatar());
-                    userInfo.setAuction_id(roomInfoResp.getRoom_auction().getAuction_user().getAuction_id());
+                    userInfo.setAuction_id(roomInfoResp.getRoom_auction().getAuction_user()!= null ? roomInfoResp.getRoom_auction().getAuction_user().getAuction_id() : "");
                     userInfo.setPit_number("888");
 
                     if (roomInfoResp.getRoom_info() != null &&
@@ -344,8 +359,10 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
                     RoomOnlineDialogFragment.show(roomInfoResp.getRoom_info().getRoom_id(), 888 + "", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
                 }
             } else {
-                RoomUserInfoFragment.show(roomInfoResp.getRoom_info().getRoom_id(), wheatView2.getUserId(), wheatView2.pitNumber, getHostUser(), false, 1, Integer.parseInt(roomInfoResp.getRoom_auction().getAuction_user().getAuction_id()), getChildFragmentManager());
+                if (roomInfoResp.getRoom_auction().getAuction_user() != null) {
 
+                    RoomUserInfoFragment.show(roomInfoResp.getRoom_info().getRoom_id(), wheatView2.getUserId(), wheatView2.pitNumber, getHostUser(), false, 1, Integer.parseInt(roomInfoResp.getRoom_auction().getAuction_user().getAuction_id() != null ? roomInfoResp.getRoom_auction().getAuction_user().getAuction_id() : "0"), getChildFragmentManager());
+                }
             }
         } else if (id == R.id.im_action_js) {//延时
             MvpPre.auctionDelay(SpUtil.getauctionId());
@@ -834,6 +851,31 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
         }
     }
 
+    public void event1003(RoomMessageEvent messageEvent) {
+        if (messageEvent.getText().getPit_number().equals("9")) {
+            wheatView.setData(getPitBean(messageEvent));
+            if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
+                imActionJs.setVisibility(View.VISIBLE);
+                imActionYs.setVisibility(View.VISIBLE);
+
+            } else {
+                getvjs();
+                imActionYs.setVisibility(INVISIBLE);
+            }
+        }
+    }
+
+    public void event1004(RoomMessageEvent messageEvent) {
+        if (messageEvent.getText().getPit_number().equals("9")) {
+            wheatView.setData(getPitBean2(messageEvent, "9"));
+            getvjs();
+            imActionYs.setVisibility(GONE);
+        } else if (messageEvent.getText().getPit_number().equals("888")) {
+            wheatView2.setData(getPitBean2(messageEvent, "888"));
+
+        }
+    }
+
     public void event1022(RoomMessageEvent messageEvent) {
         if (messageEvent.getText().getType() == 1) {//拍卖位上麦
             if (messageEvent.getText().getPit_number().equals("888")) {
@@ -841,6 +883,9 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
                 getvjs();
                 imActionYs.setVisibility(GONE);
             }
+            if (messageEvent.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
+                CardRelationshipFragment.show(roomInfoResp.getRoom_info().getRoom_id(), SpUtil.getUserId() + "", type + "", getActivity().getSupportFragmentManager());
+            }
         } else if (messageEvent.getText().getType() == 2) {//拍卖位下麦
             if (messageEvent.getText().getPit_number().equals("9")) {
                 wheatView.setData(getPitBean2(messageEvent, "9"));
@@ -850,6 +895,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
             yinc();
         }
     }
+
     public void event1025(RoomMessageEvent messageEvent) {
         if (messageEvent.getText().getRecipient() != null) {//成功
             CustomCenterDialogFragment.showWithAutoDismiss(messageEvent.getText().getRecipient(), messageEvent.getText().getAuction_user(), getActivity().getSupportFragmentManager());
@@ -867,6 +913,7 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
     public void event1021(RoomMessageEvent messageEvent) {
         mBinding.tvPB.setText("0");
     }
+
     public void event1027(RoomMessageEvent messageEvent) {
         type = messageEvent.getText().getType();
 //        getTextView();
@@ -882,9 +929,36 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
 
     }
 
+    public void event1024(RoomMessageEvent messageEvent) {
+        auctionList = messageEvent.getText().getAuction_list();
+        gexList();
+    }
+
+
+    public void event1023(RoomMessageEvent messageEvent) {
+        mBinding.ivJp.setVisibility(VISIBLE);
+        if (wheatView.pitBean.getUser_id().equals(SpUtil.getUserId() + "")) {
+            imActionYs.setVisibility(VISIBLE);
+            imActionJs.setVisibility(VISIBLE);
+        } else {
+            getvjs();
+            imActionYs.setVisibility(GONE);
+        }
+        if (messageEvent.getText().getAuction_user().getUser_id().equals(SpUtil.getUserId() + "")) {
+            mBinding.ivJp.setVisibility(INVISIBLE);
+        }
+        roomInfoResp.getRoom_auction().setAuction_user(messageEvent.getText().getAuction_user());
+        auctionId = messageEvent.getText().getAuction_user().getAuction_id();
+        SpUtil.setAuctionId(auctionId);
+        countDownTime(messageEvent.getText().getAuction_user().getDuration());
+        auctionUserBean = messageEvent.getText().getAuction_user();
+        gengv();
+    }
+
     public void event1026(RoomMessageEvent messageEvent) {
         countDownTime(messageEvent.getText().getDuration());
     }
+
     public void event1035(RoomMessageEvent messageEvent) {
         RoomPitBean pitBean = mBinding.roomMakeWheat.pitBean;
         if (pitBean.getUser_id().equals(messageEvent.getText().getFromUserInfo().getUser_id() + "")) {
@@ -1255,7 +1329,6 @@ public class RoomAuctionFragment extends BaseMvpFragment<RoomAuctionPresenterTow
     }
 
 
-
     ///
 
 }
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java
index 9e524b8..57647f8 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java
@@ -217,24 +217,6 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
     protected void initData() {
 
         loadSubFragment();
-//        V2TIMManager.getConversationManager().getTotalUnreadMessageCount(new V2TIMValueCallback<Long>() {
-//            @Override
-//            public void onSuccess(Long aLong) {
-//                if (aLong == 0) {
-//                    mBinding.ivMessageDot.setVisibility(View.GONE);
-//                    mBinding.ivMessageDot.setText("0");
-//                } else {
-//                    mBinding.ivMessageDot.setVisibility(View.VISIBLE);
-//                }
-//                mBinding.ivMessageDot.setText(String.valueOf(aLong));
-//            }
-//
-//            @Override
-//            public void onError(int code, String desc) {
-//
-//            }
-//        });
-//        updateChildFragmentViews();
     }
 
 //    @Subscribe(threadMode = ThreadMode.MAIN)
@@ -252,13 +234,16 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
     // 定义一个可被外部调用的方法
     public void refreshData(RoomInfoResp resp) {
         // 使用传入的参数刷新界面或逻辑
-        mRoomInfoResp = new RoomInfoResp();
         mRoomInfoResp = resp;
         loadSubFragment();
         // 更新子Fragment视图
         updateChildFragmentViews();
     }
 
+    private <T extends Fragment> T findFragmentByTag(Class<T> fragmentClass) {
+        return (T) getChildFragmentManager().findFragmentByTag(fragmentClass.getSimpleName());
+    }
+
     public void updateChildFragmentViews() {
 
         // 使用弱引用避免内存泄漏
@@ -272,29 +257,23 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
                 String labelId = mRoomInfoResp.getRoom_info().getLabel_id();
 
                 if ("7".equals(typeId)) {
-                    // 保持 tag 使用一致性
-                    FriendshipRoomFragment friendshipRoomFragment = (FriendshipRoomFragment) getChildFragmentManager()
-                            .findFragmentByTag(FriendshipRoomFragment.class.getSimpleName());
+                    FriendshipRoomFragment friendshipRoomFragment = findFragmentByTag(FriendshipRoomFragment.class);
                     if (friendshipRoomFragment != null && friendshipRoomFragment.isAdded()) {
                         friendshipRoomFragment.roomInfoUpdate(mRoomInfoResp);
                     }
-
-                } else if ("2".equals(typeId)) {//拍卖房
-                    RoomAuctionFragment auctionRoomFragment = (RoomAuctionFragment) getChildFragmentManager()
-                            .findFragmentByTag(RoomAuctionFragment.class.getSimpleName());
+                } else if ("2".equals(typeId)) {
+                    RoomAuctionFragment auctionRoomFragment = findFragmentByTag(RoomAuctionFragment.class);
                     if (auctionRoomFragment != null && auctionRoomFragment.isAdded()) {
                         auctionRoomFragment.roomInfoUpdate(mRoomInfoResp);
                     }
-                }else if ("1".equals(typeId) || "3".equals(typeId) || "4".equals(typeId)){
-                    if ("2".equals(labelId)){
-                        RoomKtvFragment roomKtvFragment = (RoomKtvFragment) getChildFragmentManager()
-                                .findFragmentByTag(RoomKtvFragment.class.getSimpleName());
+                } else if ("1".equals(typeId) || "3".equals(typeId) || "4".equals(typeId)) {
+                    if ("2".equals(labelId)) {
+                        RoomKtvFragment roomKtvFragment = findFragmentByTag(RoomKtvFragment.class);
                         if (roomKtvFragment != null && roomKtvFragment.isAdded()) {
                             roomKtvFragment.roomInfoUpdate(mRoomInfoResp);
                         }
-                    }else if ("1".equals(labelId)){
-                        SingSongFragment singSongFragment = (SingSongFragment) getChildFragmentManager()
-                                .findFragmentByTag(SingSongFragment.class.getSimpleName());
+                    } else if ("1".equals(labelId)) {
+                        SingSongFragment singSongFragment = findFragmentByTag(SingSongFragment.class);
                         if (singSongFragment != null && singSongFragment.isAdded()) {
                             singSongFragment.roomInfoUpdate(mRoomInfoResp);
                         }
@@ -303,43 +282,15 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
             }
         });
 
-//        // 根据当前房间类型更新对应的子Fragment
-//        if (mRoomInfoResp != null && mRoomInfoResp.getRoom_info() != null) {
-//            String typeId = mRoomInfoResp.getRoom_info().getType_id();
-//            String labelId = mRoomInfoResp.getRoom_info().getLabel_id();
-//
-//            if ("7".equals(typeId)) {
-////                if ("1".equals(labelId)) {
-////                    // 更新SingSongFragment
-////                    SingSongFragment singSongFragment = (SingSongFragment) getChildFragmentManager()
-////                            .findFragmentByTag(SingSongFragment.class.getSimpleName());
-////                    if (singSongFragment != null) {
-////                        singSongFragment.updateView(mRoomInfoResp);
-////                    }
-////                } else if ("2".equals(labelId)) {
-////                    // 更新RoomKtvFragment
-////                    RoomKtvFragment roomKtvFragment = (RoomKtvFragment) getChildFragmentManager()
-////                            .findFragmentByTag(RoomKtvFragment.class.getSimpleName());
-////                    if (roomKtvFragment != null) {
-////                        roomKtvFragment.updateView(mRoomInfoResp);
-////                    }
-////                }
-//                FriendshipRoomFragment friendshipRoomFragment = (FriendshipRoomFragment) getChildFragmentManager()
-//                        .findFragmentByTag(FriendshipRoomFragment.class.getName());
-//                        if (friendshipRoomFragment != null) {
-//                            friendshipRoomFragment.roomInfoUpdate(mRoomInfoResp);
-//                        }
-//            }
-//            // 其他类型房间的处理...
-//        }
     }
 
 
     /// 给子fragment传递参数
     public void updateFriendshipState(int status, int friend_id, long end_time, FriendUserBean friendshipUserBean) {
         // 保持 tag 使用一致性
-        FriendshipRoomFragment friendshipRoomFragment = (FriendshipRoomFragment) getChildFragmentManager()
-                .findFragmentByTag(FriendshipRoomFragment.class.getSimpleName());
+        FriendshipRoomFragment friendshipRoomFragment = findFragmentByTag(FriendshipRoomFragment.class);
+//        FriendshipRoomFragment friendshipRoomFragment = (FriendshipRoomFragment) getChildFragmentManager()
+//                .findFragmentByTag(FriendshipRoomFragment.class.getSimpleName());
         if (friendshipRoomFragment != null && friendshipRoomFragment.isAdded()) {
             if (status == FriendshipRoomFragment.FriendshipPartType.WAIT.getValue())
                 friendshipRoomFragment.upDataFriendship(FriendshipRoomFragment.FriendshipPartType.WAIT, friend_id, end_time, friendshipUserBean);
@@ -352,8 +303,7 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
 
     /// 交友房时间发生延时
     public void friendTimeDelayWithTime(long end_time) {
-        FriendshipRoomFragment friendshipRoomFragment = (FriendshipRoomFragment) getChildFragmentManager()
-                .findFragmentByTag(FriendshipRoomFragment.class.getSimpleName());
+        FriendshipRoomFragment friendshipRoomFragment = findFragmentByTag(FriendshipRoomFragment.class);
         if (friendshipRoomFragment != null)
             friendshipRoomFragment.friendTimeDelayWithTime(end_time);
 
@@ -361,24 +311,21 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
 
     /// 心动值发生变化
     public void friendHeartNumberDidChanged(List<FriendInfo.HeartList> heartLists) {
-        FriendshipRoomFragment friendshipRoomFragment = (FriendshipRoomFragment) getChildFragmentManager()
-                .findFragmentByTag(FriendshipRoomFragment.class.getSimpleName());
+        FriendshipRoomFragment friendshipRoomFragment = findFragmentByTag(FriendshipRoomFragment.class);
         if (friendshipRoomFragment != null)
             friendshipRoomFragment.friendHeartNumberDidChanged(heartLists);
     }
 
     /// 交友房麦位发生变化
     public void friendSeatDidChanged(List<RoomPitBean> pitArr) {
-        FriendshipRoomFragment friendshipRoomFragment = (FriendshipRoomFragment) getChildFragmentManager()
-                .findFragmentByTag(FriendshipRoomFragment.class.getSimpleName());
+        FriendshipRoomFragment friendshipRoomFragment = findFragmentByTag(FriendshipRoomFragment.class);
         if (friendshipRoomFragment != null)
             friendshipRoomFragment.friendSeatDidChanged(pitArr);
     }
 
     /// 小黑屋修改倒计时
     public void upCabinFragment(long time) {
-        RoomCabinFragment roomCabinFragment = (RoomCabinFragment) getChildFragmentManager()
-                .findFragmentByTag(RoomCabinFragment.class.getSimpleName());
+        RoomCabinFragment roomCabinFragment = findFragmentByTag(RoomCabinFragment.class);
         if (roomCabinFragment != null)
             roomCabinFragment.upCabinFragment(time);
     }
@@ -386,35 +333,42 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
     private void loadSubFragment() {
 
         if (mRoomInfoResp == null || mRoomInfoResp.getRoom_info() == null) return;
+        String typeId = mRoomInfoResp.getRoom_info().getType_id();
+        String labelId = mRoomInfoResp.getRoom_info().getLabel_id();
 
-        if (mRoomInfoResp.getRoom_info().getType_id().equals("1")) {//点唱
-            if (mRoomInfoResp.getRoom_info().getLabel_id().equals("1")) {
-                replaceNestedFragment(SingSongFragment.newInstance(), R.id.container);
-            } else if (mRoomInfoResp.getRoom_info().getLabel_id().equals("2")) {
-                replaceNestedFragment(RoomKtvFragment.newInstance(), R.id.container);
+        Fragment newFragment = null;
+
+        if ("1".equals(typeId)) {
+            if ("1".equals(labelId)) {
+                newFragment = SingSongFragment.newInstance();
+            } else if ("2".equals(labelId)) {
+                newFragment = RoomKtvFragment.newInstance();
             }
-        } else if (mRoomInfoResp.getRoom_info().getType_id().equals("2")) {//拍卖
-            replaceNestedFragment(RoomAuctionFragment.newInstance(), R.id.container);
-        } else if (mRoomInfoResp.getRoom_info().getType_id().equals("6")) {
-            replaceNestedFragment(RoomCabinFragment.newInstance(mRoomInfoResp), R.id.container);
+        } else if ("2".equals(typeId)) {
+            newFragment = RoomAuctionFragment.newInstance();
+        } else if ("6".equals(typeId)) {
+            newFragment = RoomCabinFragment.newInstance(mRoomInfoResp);
             setviewyc();
-        } else if (mRoomInfoResp.getRoom_info().getType_id().equals("3")) {//男神
-            if (mRoomInfoResp.getRoom_info().getLabel_id().equals("1")) {
-                replaceNestedFragment(SingSongFragment.newInstance(), R.id.container);
-            } else if (mRoomInfoResp.getRoom_info().getLabel_id().equals("2")) {
-                replaceNestedFragment(RoomKtvFragment.newInstance(), R.id.container);
+        } else if ("3".equals(typeId)) {
+            if ("1".equals(labelId)) {
+                newFragment = SingSongFragment.newInstance();
+            } else if ("2".equals(labelId)) {
+                newFragment = RoomKtvFragment.newInstance();
             }
-        } else if (mRoomInfoResp.getRoom_info().getType_id().equals("4")) {//女神
-            if (mRoomInfoResp.getRoom_info().getLabel_id().equals("1")) {
-                replaceNestedFragment(SingSongFragment.newInstance(), R.id.container);
-//                replaceNestedFragment(RoomPkFragment.newInstance(mRoomInfoResp), R.id.container);
-            } else if (mRoomInfoResp.getRoom_info().getLabel_id().equals("2")) {
-                replaceNestedFragment(RoomKtvFragment.newInstance(), R.id.container);
+        } else if ("4".equals(typeId)) {
+            if ("1".equals(labelId)) {
+                newFragment = SingSongFragment.newInstance();
+            } else if ("2".equals(labelId)) {
+                newFragment = RoomKtvFragment.newInstance();
             }
-        } else if (mRoomInfoResp.getRoom_info().getType_id().equals("7")) {
-            replaceNestedFragment(FriendshipRoomFragment.newInstance(), R.id.container);
+        } else if ("7".equals(typeId)) {
+            newFragment = FriendshipRoomFragment.newInstance();
         }
-        instView();
+
+        if (newFragment != null) {
+            replaceNestedFragment(newFragment, R.id.container);
+        }
+//        instView();
         setview();
 
         if (mRoomInfoResp.getUser_info().getPit_number() != 0) {
@@ -460,30 +414,14 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
 
     public void replaceNestedFragment(@NonNull Fragment newFragment, int containerId) {
         String tag = newFragment.getClass().getSimpleName(); // 使用类名作为 tag
-//
-//        FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
-//
-//        // 查找当前容器中的 Fragment（可选）
-//        Fragment currentFragment = getChildFragmentManager().findFragmentById(containerId);
-//
-//        if (currentFragment != null) {
-//            if (tag.equals(currentFragment.getClass().getName())) {
-//                return; // 跳过相同类型替换
-//            }
-//            transaction.remove(currentFragment); // 先移除旧 Fragment
-//        }
-//
-//        // 添加新 Fragment 并带上 tag
-//        transaction.add(containerId, newFragment, tag)
-//                .commitAllowingStateLoss();
 
         FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
         // 可选：检查是否已有相同类型的 Fragment
-        Fragment existing = getChildFragmentManager().findFragmentById(containerId);
-        if (existing != null) {
-            transaction.remove(existing);
-        }
-        transaction.replace(containerId, newFragment,tag);
+//        Fragment existing = getChildFragmentManager().findFragmentById(containerId);
+//        if (existing != null) {
+//            transaction.remove(existing);
+//        }
+        transaction.replace(containerId, newFragment, tag);
         transaction.commitAllowingStateLoss();
 
     }
@@ -497,13 +435,13 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
             mRoomInfoResp.getUser_info().setPit_number(0);
         }
         if (isMine) {
-            instView();
+//            instView();
         }
 
         if (getActivity() instanceof RoomActivity) {
             ((RoomActivity) getActivity()).upRoomInfo(mRoomInfoResp);
         }
-        updateSeatViewExchangedWithPitArray(mRoomInfoResp);
+//        updateSeatViewExchangedWithPitArray(mRoomInfoResp);
     }
 
     public void updateSeatViewExchangedWithPitArray(RoomInfoResp roomInfoResp) {
@@ -511,6 +449,10 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
         updateChildFragmentViews();
     }
 
+    public void upRoomInfo(RoomInfoResp roomInfoResp) {
+        mRoomInfoResp = roomInfoResp;
+    }
+
     public void setview() {//这里是当进入电影放房的时候，如果是排麦模式，并且不是电影放的时候，就隐藏排麦视图
         if (mRoomInfoResp.getRoom_info().getRoom_up_pit_type().equals("1") && !mRoomInfoResp.getRoom_info().getType_id().equals("6")) {
 //            mBinding.clFirstCharge.setVisibility(View.VISIBLE);
@@ -593,25 +535,12 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
                 Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
         );
 
-//        mBinding.tvFirst.setText(spannableStringBuilder);
         ((RoomActivity) getActivity()).tvFirst(spannableStringBuilder);
         ((RoomActivity) getActivity()).setRoleType(roleType, pitNumber);
     }
 
     @Override
     protected void initView() {
-//        mBinding.ivChat.setOnClickListener(this::onViewClicked);
-//        mBinding.llInput.setOnClickListener(this::onViewClicked);
-//        mBinding.rlMisc.setOnClickListener(this::onViewClicked);
-//        mBinding.rlGift.setOnClickListener(this::onViewClicked);
-//        mBinding.ivSoundEffects.setOnClickListener(this::onViewClicked);
-//        mBinding.ivWheatFeeding.setOnClickListener(this::onViewClicked);
-//        mBinding.clFirstCharge.setOnClickListener(this::onViewClicked);
-//        mBinding.rlMic.setOnClickListener(this::onViewClicked);
-//        mBinding.rlSett.setOnClickListener(this::onViewClicked);
-//        mBinding.rlVoive.setOnClickListener(this::onViewClicked);
-//        mBinding.rlMore.setOnClickListener(this::onViewClicked);
-//        mBinding.rlMessage.setOnClickListener(this::onViewClicked);
     }
 
     public void mus() {
@@ -622,163 +551,10 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
         }
     }
 
-    private void onViewClicked(View view) {
-        int id = view.getId();
-//        if (id == R.id.iv_chat) {
-//            if (mRoomInfoResp.getUser_info().getIs_mute().equals("1")) {
-//                ToastUtils.show("您已经被禁言");
-//            } else {
-//
-////                mBinding.llInput.setVisibility(View.VISIBLE);
-////                mBinding.inputMenu1.bringToFront(); // 强制将该 View 置于最上层
-////                mBinding.inputMenu1.show();
-//                dialogDismiss();
-//
-//            }
-//        }
-//        else if (id == R.id.ll_input) {
-//            mBinding.llInput.setVisibility(View.GONE);
-//            mBinding.inputMenu1.dismiss();
-//        }
-//        else if (id == R.id.rl_misc) {//设置点歌
-//            if (mRoomInfoResp.getRoom_info().getLabel_id().equals("1")) {
-//                queren();
-//            } else {
-//                RequestDialogFragment.show(roomId, mRoomInfoResp, 1, getChildFragmentManager());
-//            }
-//        } else if (id == R.id.rl_gift) {//礼物
-//            RoomGiftDialogFragment.show(mRoomInfoResp, null, roomId, 0, "", getChildFragmentManager());
-//        } else
-//            if (id == R.id.iv_sound_effects) {
-//            SoundEffectsDialogFragment.show(roomId, getChildFragmentManager());
-//        } else if (id == R.id.cl_first_charge) {
-//            showWheatFeedingDialog(roomId, (mRoomInfoResp.getUser_info().getIs_room_owner() == 1 || mRoomInfoResp.getUser_info().getIs_host() == 1 || mRoomInfoResp.getUser_info().getIs_management() == 1) ? 1 : 2);
-//        } else
-//            if (id == R.id.iv_wheat_feeding) {//点击上麦操作
-//            if (mRoomInfoResp.getRoom_info().getRoom_up_pit_type().equals("1")) {
-////                showWheatFeedingDialog(roomId, mRoomInfoResp.getUser_info().getPit_number() == 9  ? 1 : 2);
-//                if (aBoolean) {
-//                    MvpPre.applyPit(roomId, "");
-////                    aBoolean = false;
-//                } else {
-//                    MvpPre.downPit(roomId, "");
-////                    aBoolean = true;
-//                }
-//            } else {
-//
-//                if (aBoolean) {
-////                    mBinding.ivWheatFeeding.setImageResource(com.xscm.moduleutil.R.mipmap.room_wheat_feeding_up);
-//                    MvpPre.applyPit(roomId, "");
-//                    aBoolean = false;
-//                } else {
-////                    mBinding.ivWheatFeeding.setImageResource(com.xscm.moduleutil.R.mipmap.room_wheat_feeding);
-//                    MvpPre.downPit(roomId, "");
-//                    aBoolean = true;
-//                }
-//            }
-//        }
-//            else if (id == R.id.rl_mic) {
-//            if (mRoomInfoResp.getUser_info().getIs_mute_pit() != null && mRoomInfoResp.getUser_info().getIs_mute_pit().equals("1")) {
-//                ToastUtils.show("您被禁麦了");
-//            } else {
-//                if (isSwith) {
-//                    switchMic(1);
-//                } else {
-//                    switchMic(2);
-//                }
-//            }
-//        } else if (id == R.id.rl_sett) {//房间设置
-//            RoomSettingFragment.show(mRoomInfoResp, getChildFragmentManager());
-//        } else if (id == R.id.rl_voive) {
-//            if (voive) {
-//                mBinding.imVoive.setImageResource(com.xscm.moduleutil.R.mipmap.room_voice_g);
-//                voive = false;
-//            } else {
-//                mBinding.imVoive.setImageResource(com.xscm.moduleutil.R.mipmap.room_voice_kg);
-//                voive = true;
-//            }
-//            AgoraManager.getInstance(getActivity()).muteSpeaker(!voive);
-//        } else if (id == R.id.rl_more) {//点击PK
-//            RoomPkDialogFragment.newInstance(roomId, SpUtil.getUserId() + "", mRoomInfoResp.getRoom_info().getIs_pk()).show(getChildFragmentManager(), "RoomPkDialogFragment");
-//        } else if (id == R.id.rl_message) {
-//            RoomMessageDialogFragment.show(getChildFragmentManager());
-////            RoomMessageDialogFragment.newInstance(roomId, SpUtil.getUserId() + "", mRoomInfoResp.getRoom_info().getIs_pk()).show(getChildFragmentManager(), "RoomMessageDialogFragment");
-//        }
-    }
 
     private boolean canSend = true;
     private CountDownTimer mCountDownTimer;
 
-    @SuppressLint("MissingInflatedId")
-    public void dialogDismiss() {
-
-//        // 使用 AlertDialog.Builder
-        AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
-        LayoutInflater inflater = getLayoutInflater();
-        View dialogView = inflater.inflate(com.xscm.moduleutil.R.layout.room_message_input_menu, null);
-        builder.setView(dialogView);
-        EditText etContent = dialogView.findViewById(com.xscm.moduleutil.R.id.et_content);
-        Button tvSend = dialogView.findViewById(com.xscm.moduleutil.R.id.tv_send);
-        // 创建 AlertDialog
-        final AlertDialog dialog = builder.create();
-        // 设置对话框在底部显示
-        Window window = dialog.getWindow();
-        if (window != null) {
-            window.setGravity(Gravity.BOTTOM);
-            window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-            window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN | WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
-        }
-//        dialog.getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-        // 设置对话框在底部显示
-//        dialog.getWindow().setGravity(Gravity.BOTTOM);
-        // 自动弹出键盘
-        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
-        tvSend.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (!canSend) {
-                    ToastUtils.show("消息发送较频繁~");
-                    return;
-                }
-                String text = etContent.getText().toString();
-                if (TextUtils.isEmpty(text)) {
-                    ToastUtils.show("请输入评论内容");
-                    return;
-                }
-                EventBus.getDefault().post(new RoomInputEvent(text));
-                etContent.setText("");
-                countDownTimer();
-                dialog.dismiss();
-            }
-        });
-
-        dialog.setOnShowListener(new DialogInterface.OnShowListener() {
-            @Override
-            public void onShow(DialogInterface dialogInterface) {
-                etContent.requestFocus();
-                InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
-                imm.showSoftInput(etContent, InputMethodManager.SHOW_IMPLICIT);
-            }
-        });
-        dialog.show();
-
-    }
-
-    private void countDownTimer() {
-        releaseCountDownTimer();
-        mCountDownTimer = new CountDownTimer(3 * 1000L, 1000L) {
-            @Override
-            public void onTick(long millisUntilFinished) {
-                canSend = false;
-            }
-
-            @Override
-            public void onFinish() {
-                canSend = true;
-            }
-        };
-        mCountDownTimer.start();
-    }
 
     private void releaseCountDownTimer() {
         if (mCountDownTimer != null) {
@@ -787,20 +563,6 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
         }
     }
 
-//    @Subscribe(threadMode = ThreadMode.MAIN)
-//    public void roomInfoEvent(RoomWheatEvent messageEvent) {
-//        if (messageEvent.getRoomId().equals(roomId)) {
-//            if (messageEvent.isOccupied()) {
-//                mBinding.ivWheatFeeding.setImageResource(com.xscm.moduleutil.R.mipmap.room_wheat_feeding_up);
-//                aBoolean = false;
-//            } else {
-//                mBinding.ivWheatFeeding.setImageResource(com.xscm.moduleutil.R.mipmap.room_wheat_feeding);
-//                aBoolean = true;
-//            }
-//        }
-//    }
-
-
     private void queren() {
         // 创建并显示确认对话框
         new ConfirmDialog(getActivity(),
@@ -949,195 +711,50 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
 
     }
 
-    private boolean haveMe = false;
 
     public void getVoiceStatus(RoomAuction.AuctionUserBean auctionUserBean, List<RoomAuction.AuctionListBean> auctionListBeans, String user_id) {
-        if (auctionListBeans != null) {
-            for (int i = 0; i < auctionListBeans.size(); i++) {
-                if (i < 3) {
-                    if (auctionListBeans.get(i).getUser_id().equals(SpUtil.getUserId() + "")) {
-                        haveMe = true;
-                        break;
+        boolean haveMe = false;
 
-                    }
-                }
-            }
-            if (auctionUserBean != null) {
-                if (auctionUserBean.getUser_id().equals(SpUtil.getUserId() + "")) {//判断我是不是被拍卖者
+        if (auctionListBeans != null) {
+            for (int i = 0; i < Math.min(auctionListBeans.size(), 3); i++) {
+                if (auctionListBeans.get(i).getUser_id().equals(SpUtil.getUserId() + "")) {
                     haveMe = true;
+                    break;
                 }
             }
-            if (user_id.equals(SpUtil.getUserId() + "")) {
+
+            if (!haveMe && auctionUserBean != null && auctionUserBean.getUser_id().equals(SpUtil.getUserId() + "")) {
                 haveMe = true;
             }
 
-            if (!haveMe) {
-                AgoraManager.getInstance(getContext()).ClientRole(false);
-//                mBinding.rlMic.setVisibility(View.GONE);
-                ((RoomActivity) getActivity()).setrlMic(false);
-                AgoraManager.getInstance(getContext()).setLocalAudioEnabled(false, SpUtil.getUserId() + "");
-//                switchMic(2);
+            if (!haveMe && user_id.equals(SpUtil.getUserId() + "")) {
+                haveMe = true;
+            }
 
-            } else {
-                ((RoomActivity) getActivity()).setrlMic(true);
-//                mBinding.rlMic.setVisibility(View.VISIBLE);
-                if (AgoraManager.getInstance(getContext()).isLocalAudioEnabled()) {
-
-                    ((RoomActivity) getActivity()).ivMic(com.xscm.moduleutil.R.mipmap.room_microphone);
-//                    mBinding.ivMic.setImageResource(com.xscm.moduleutil.R.mipmap.room_microphone);
+            if (getActivity() instanceof RoomActivity) {
+                RoomActivity roomActivity = (RoomActivity) getActivity();
+                if (!haveMe) {
+                    AgoraManager.getInstance(getContext()).ClientRole(false);
+                    roomActivity.setrlMic(false);
+                    AgoraManager.getInstance(getContext()).setLocalAudioEnabled(false, SpUtil.getUserId() + "");
                 } else {
-                    ((RoomActivity) getActivity()).ivMic(com.xscm.moduleutil.R.mipmap.room_microphone_off);
-//                    mBinding.ivMic.setImageResource(com.xscm.moduleutil.R.mipmap.room_microphone_off);
+                    roomActivity.setrlMic(true);
+                    if (AgoraManager.getInstance(getContext()).isLocalAudioEnabled()) {
+                        roomActivity.ivMic(com.xscm.moduleutil.R.mipmap.room_microphone);
+                    } else {
+                        roomActivity.ivMic(com.xscm.moduleutil.R.mipmap.room_microphone_off);
+                    }
                 }
-
             }
         } else {
-            if (!user_id.equals(SpUtil.getUserId() + "")) {
+            if (!user_id.equals(SpUtil.getUserId() + "") && getActivity() instanceof RoomActivity) {
                 AgoraManager.getInstance(getContext()).ClientRole(false);
-//                mBinding.rlMic.setVisibility(View.GONE);
                 ((RoomActivity) getActivity()).setrlMic(false);
                 AgoraManager.getInstance(getContext()).setLocalAudioEnabled(false, SpUtil.getUserId() + "");
             }
         }
-
-        haveMe = false;
-
-
     }
 
-
-//    public void setRoleType(int roleType, int pit_number) {
-//        RelativeLayout rl_voive = mBinding.rlVoive;
-//        RelativeLayout rl_mic = mBinding.rlMic;
-//        RelativeLayout rl_more = mBinding.rlMore;
-//        RelativeLayout rl_misc = mBinding.rlMisc;
-//
-//
-//        // 默认隐藏所有按钮
-//        rl_voive.setVisibility(View.GONE);//声音
-//        rl_more.setVisibility(View.GONE);//PK
-//        rl_misc.setVisibility(View.GONE); //音乐
-//        rl_mic.setVisibility(View.GONE); // 麦克风
-//        //根据角色类型显示按钮
-//        switch (roleType) {
-//            case 2: // 主持人
-//                rl_voive.setVisibility(View.VISIBLE);
-//                rl_mic.setVisibility(pit_number != 0 ? View.VISIBLE : View.GONE);
-//                rl_more.setVisibility((pit_number == 9 && pit_number != -11) ? View.VISIBLE : View.GONE);
-//                rl_misc.setVisibility(View.VISIBLE);
-//                break;
-//
-//            case 1: // 房主
-//                rl_voive.setVisibility(View.VISIBLE);
-//                rl_mic.setVisibility(pit_number != 0 ? View.VISIBLE : View.GONE);
-//                rl_more.setVisibility((pit_number == 9 && pit_number != -11) ? View.VISIBLE : View.GONE);
-//                rl_misc.setVisibility(View.VISIBLE);
-//                break;
-//
-//            case 3://麦上用户
-//                rl_voive.setVisibility(View.VISIBLE);
-//                rl_mic.setVisibility(pit_number != 0 ? View.VISIBLE : View.GONE);
-//                rl_more.setVisibility((pit_number == 9 && pit_number != -11) ? View.VISIBLE : View.GONE);
-//                rl_misc.setVisibility(View.VISIBLE);
-//                break;
-//
-//            case 0: // 观众
-//                rl_voive.setVisibility(View.VISIBLE);
-//                rl_mic.setVisibility(pit_number != 0 ? View.VISIBLE : View.GONE);
-//                rl_misc.setVisibility(View.VISIBLE);
-//                break;
-//
-//            case 5: // 房间管理员
-//                rl_voive.setVisibility(View.VISIBLE);
-//                rl_more.setVisibility(View.GONE);//PK
-//                rl_misc.setVisibility(View.GONE); //音乐
-//                break;
-//
-//            default:
-//                break;
-//        }
-//
-//        if (mRoomInfoResp.getRoom_info().getType_id().equals("2")) {
-//            rl_misc.setVisibility(View.GONE);
-//            rl_more.setVisibility(View.GONE);
-//        } else if (roleType != 5) {
-//            rl_misc.setVisibility(View.VISIBLE);
-//            if (mRoomInfoResp.getUser_info().getPit_number() == 9) {
-//                rl_more.setVisibility(View.VISIBLE);
-//            }
-//        }
-//        if ((mRoomInfoResp.getRoom_info().getType_id().equals("1") || mRoomInfoResp.getRoom_info().getType_id().equals("4") || mRoomInfoResp.getRoom_info().getType_id().equals("3")) && mRoomInfoResp.getRoom_info().getLabel_id().equals("2")) {
-//            rl_more.setVisibility(View.GONE);
-//        }
-//        if (mRoomInfoResp.getUser_info().getPit_number() > 0) {
-//            rl_mic.setVisibility(View.VISIBLE);
-//            ((RoomActivity) getActivity()).switchMic( 2);
-////            switchMic(2);
-//        } else {
-//            if (pit_number == 888) {
-//
-//                rl_mic.setVisibility(View.VISIBLE);
-//                switchMic(2);
-//                ((RoomActivity) getActivity()).switchMic( 2);
-//            } else {
-//                switchMic(2);
-//                rl_mic.setVisibility(View.GONE);
-//            }
-//        }
-//
-////        if (roleType == 5 ){
-////            rl_misc.setVisibility(View.GONE);
-////            rl_more.setVisibility(View.GONE);
-////        }
-//
-////        for (int i = 0; i < mRoomInfoResp.getRoom_info().getPit_list().size(); i++) {
-////            if (mRoomInfoResp.getRoom_info().getPit_list().get(i).getUser_id().equals(SpUtil.getUserId() + "")) {
-////                rl_mic.setVisibility(View.VISIBLE);
-////            }
-////        }
-//
-//        if (mRoomInfoResp.getRoom_info().getType_id().equals("6")) {
-//            rl_voive.setVisibility(View.GONE);//声音
-//            rl_more.setVisibility(View.GONE);//PK
-//            rl_misc.setVisibility(View.GONE); //音乐
-//            rl_mic.setVisibility(View.GONE); // 麦克风
-//            mBinding.rlMessage.setVisibility(View.GONE);
-//        } else if (mRoomInfoResp.getRoom_info().getType_id().equals("7")) {
-//            rl_more.setVisibility(View.GONE);//PK
-//            rl_misc.setVisibility(View.GONE); //音乐
-//        }
-//
-//
-//    }
-
-//    /**
-//     * 设置是否打开麦克风
-//     *
-//     * @param type
-//     */
-//    //    @Override
-//    public void switchMic(int type) {
-////        mRoomInfoResp.getUser_info().setVoice(type);
-//        if (type == 1) {
-//            mBinding.ivMic.setImageResource(com.xscm.moduleutil.R.mipmap.room_microphone);
-//            AgoraManager.getInstance(getContext()).setLocalAudioEnabled(true, SpUtil.getUserId() + "");
-//            isSwith = false;
-//            AgoraManager.getInstance(getActivity()).muteLocalAudioStream(false);
-//            AgoraManager.getInstance(getActivity()).ClientRole(true);
-//        } else {
-//            mBinding.ivMic.setImageResource(com.xscm.moduleutil.R.mipmap.room_microphone_off);
-//            AgoraManager.getInstance(getContext()).setLocalAudioEnabled(false, SpUtil.getUserId() + "");
-////            AgoraManager.getInstance(getActivity()).muteLocalAudioStream(false);
-////            AgoraManager.getInstance(getActivity()).ClientRole( false);
-//            isSwith = true;
-////            AgoraManager.getInstance(getActivity()).muteLocalAudioStream(true);
-////            AgoraManager.getInstance(getActivity()).setLocalAudioEnabled( false);
-//            isMute(1);
-//
-//
-//        }
-//    }
-
     public void isMute(int is_mute) {
         RoomMessageEvent.text text = new RoomMessageEvent.text();
         text.setIs_mute(is_mute);
@@ -1243,6 +860,7 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
                 .findFragmentByTag(RoomAuctionFragment.class.getSimpleName());
 
         if (auctionFragment != null) {
+            auctionFragment.upRoomInfo(mRoomInfoResp);
             switch (messageEvent.getMsgType()) {
                 case 1022:
                     auctionFragment.event1022(messageEvent);
@@ -1265,6 +883,18 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
                 case 1027:
                     auctionFragment.event1027(messageEvent);
                     break;
+                case 1023:
+                    auctionFragment.event1023(messageEvent);
+                    break;
+                case 1024:
+                    auctionFragment.event1024(messageEvent);
+                    break;
+                case 1004:
+                    auctionFragment.event1004(messageEvent);
+                    break;
+                case 1003:
+                    auctionFragment.event1003(messageEvent);
+                    break;
                 default:
                     // 可以添加默认处理或日志记录
                     LogUtils.w("Unhandled auction message type: " + messageEvent.getMsgType());
@@ -1307,9 +937,11 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
 
     // TODO: 2025/8/30 点唱房模式
     public void SingSongEvent(RoomMessageEvent messageEvent) {
+
         SingSongFragment singSongFragment = (SingSongFragment) getChildFragmentManager()
                 .findFragmentByTag(SingSongFragment.class.getSimpleName());
         if (singSongFragment != null) {
+            singSongFragment.upRoonInfo(mRoomInfoResp);
             switch (messageEvent.getMsgType()) {
                 case 1037:
                     singSongFragment.event1037(messageEvent);
@@ -1338,8 +970,11 @@ public class RoomFragment extends BaseMvpFragment<RoomPresenter, FragmentRoomBin
                 case 1033:
                     singSongFragment.event1033(messageEvent);
                     break;
-
-
+                case 1035:
+                    singSongFragment.event1035(messageEvent);
+                    break;
+                case 1021:
+                    singSongFragment.event1021(messageEvent);
                 default:
                     // 可以添加默认处理或日志记录
                     LogUtils.w("Unhandled auction message type: " + messageEvent.getMsgType());
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/SingSongFragment.java b/moduleroom/src/main/java/com/example/moduleroom/fragment/SingSongFragment.java
index 69fb89f..c722c69 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/SingSongFragment.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/fragment/SingSongFragment.java
@@ -102,7 +102,8 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
     CountDownTimer mCountDownTimer;
     CountDownTimer mCountDownTimersta;
     private RoomFragment parentFragment;
-    List<RoomPitBean> pitList ;
+    List<RoomPitBean> pitList;
+
     public static SingSongFragment newInstance() {
         Bundle args = new Bundle();
         SingSongFragment fragment = new SingSongFragment();
@@ -129,14 +130,14 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
     }
 
     private void upDtaView() {
-        pitList= new ArrayList<>();
+        pitList = new ArrayList<>();
         if (getActivity() instanceof RoomActivity) {
             ((RoomActivity) getActivity()).setvisibTop(true);
         }
         // 初始化 PopupWindow
         initPopupWindow();
         isWhether();
-        parentFragment= (RoomFragment) getParentFragment();
+        parentFragment = (RoomFragment) getParentFragment();
 
     }
 
@@ -277,9 +278,11 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
             }
             return false;
         } else {
-
-            if (roomInfoResp.getRoom_info().getPit_list().get(8).getUser_id().equals(SpUtil.getUserId() + "") && !pitNumber.equals("10")) {
-                return true;
+            if (roomInfoResp.getRoom_info().getPit_list().size() > 8) {
+                if (roomInfoResp.getRoom_info().getPit_list().get(8).getUser_id().equals(SpUtil.getUserId() + "") && !pitNumber.equals("10")) {
+                    return true;
+                }
+                return false;
             }
             return false;
         }
@@ -314,7 +317,7 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
         if (userIds.length() > 0 && roomId != null) {
             MvpPre.userOnlineStatus(userIds.toString(), roomId);
         } else {
-            updateWheatData();
+//            updateWheatData();
         }
     }
 
@@ -368,8 +371,27 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
 
     }
 
+    private void upWheter() {
+        if (roomInfoResp.getPk_info() == null) {
+            if (!ObjectUtils.isEmpty(roomInfoResp.getRoom_info().getPit_list()) && roomInfoResp.getRoom_info().getPit_list().size() == 10) {
+                wheatLayoutSingManager.setWheatData(roomInfoResp.getRoom_info().getPit_list());
+            }
+//            initWheatLayout();
+        } else {
+            mBinding.flexboxLayout.setVisibility(View.GONE);
+            mBinding.cl.setVisibility(View.VISIBLE);
+            MvpPre.postRoomInfo(roomInfoResp.getPk_info().getPk_room_id(), roomInfoResp.getUser_info().getPit_number() + "", 1);
+        }
+        if (roomInfoResp.getUser_info().getPit_number() != 9) {
+            mBinding.imMkf.setVisibility(GONE);
+        } else {
+            mBinding.imMkf.setVisibility(VISIBLE);
+        }
+        tzblChanged();
+    }
+
     private void isWhether() {
-        if (roomInfoResp==null){
+        if (roomInfoResp == null) {
             mBinding.flexboxLayout.setVisibility(View.VISIBLE);
             mBinding.cl.setVisibility(View.GONE);
             FlexboxLayout flexboxLayout = mBinding.flexboxLayout;
@@ -417,28 +439,28 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
                 pitList.add(pitBean);
             }
             wheatLayoutSingManager.setWheatData(pitList);
-        }else {
-            if (roomInfoResp.getPk_info() == null) {
-
-
-                if (!ObjectUtils.isEmpty(roomInfoResp.getRoom_info().getPit_list()) && roomInfoResp.getRoom_info().getPit_list().size() == 10) {
-                    wheatLayoutSingManager.setWheatData(roomInfoResp.getRoom_info().getPit_list());
-                }
-//            initWheatLayout();
-            } else {
-                mBinding.flexboxLayout.setVisibility(View.GONE);
-                mBinding.cl.setVisibility(View.VISIBLE);
-                MvpPre.postRoomInfo(roomInfoResp.getPk_info().getPk_room_id(), roomInfoResp.getUser_info().getPit_number() + "", 1);
-
-            }
-
-            if (roomInfoResp.getUser_info().getPit_number() != 9) {
-                mBinding.imMkf.setVisibility(GONE);
-            } else {
-                mBinding.imMkf.setVisibility(VISIBLE);
-            }
-
-            tzblChanged();
+        } else {
+//            if (roomInfoResp.getPk_info() == null) {
+//
+//
+//                if (!ObjectUtils.isEmpty(roomInfoResp.getRoom_info().getPit_list()) && roomInfoResp.getRoom_info().getPit_list().size() == 10) {
+//                    wheatLayoutSingManager.setWheatData(roomInfoResp.getRoom_info().getPit_list());
+//                }
+////            initWheatLayout();
+//            } else {
+//                mBinding.flexboxLayout.setVisibility(View.GONE);
+//                mBinding.cl.setVisibility(View.VISIBLE);
+//                MvpPre.postRoomInfo(roomInfoResp.getPk_info().getPk_room_id(), roomInfoResp.getUser_info().getPit_number() + "", 1);
+//
+//            }
+//
+//            if (roomInfoResp.getUser_info().getPit_number() != 9) {
+//                mBinding.imMkf.setVisibility(GONE);
+//            } else {
+//                mBinding.imMkf.setVisibility(VISIBLE);
+//            }
+//
+//            tzblChanged();
         }
 
         mBinding.btSta.setOnClickListener(this::onClick);
@@ -539,7 +561,8 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
     public void roomInfoUpdate(RoomInfoResp resp) {
         roomInfoResp = resp;
         roomId = roomInfoResp == null ? "" : roomInfoResp.getRoom_info().getRoom_id();
-        isWhether();
+//        isWhether();
+        upWheter();
         updateWheatData();
     }
 
@@ -568,7 +591,6 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
     }
 
 
-
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onSwitchPitEvent(RoomUpPitBean event) {
         if (event.getPit_number() != null && !event.getPit_number().equals("")) {
@@ -695,9 +717,9 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
     public void userOnlineStatus(List<UserOnlineStatusBean> list) {
         if (list != null) {
             for (int i = 0; i < list.size(); i++) {
-                if ( roomInfoRespPk==null|| roomInfoRespPk.getPk_info() == null) {
+                if (roomInfoRespPk == null || roomInfoRespPk.getPk_info() == null) {
                     wheatLayoutSingManager.updateSingleOnlineWheat(list.get(i));
-                }else{
+                } else {
                     wheatLayoutManager1.updateSingleOnlineWheat(list.get(i));
                 }
 //                EventBus.getDefault().post(list.get(i));
@@ -1151,8 +1173,16 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
 //
 //        }
 //    }
-    ///推送的下麦1003
-    public void event1003(RoomMessageEvent message){
+
+    public void event1021(RoomMessageEvent message) {
+        for (RoomPitBean pitBean : roomInfoResp.getRoom_info().getPit_list()) {
+            pitBean.setCharm("0");
+            wheatLayoutSingManager.updateSingleWheat(pitBean, Integer.parseInt(pitBean.getPit_number()));
+        }
+    }
+
+    /// 推送的下麦1003
+    public void event1003(RoomMessageEvent message) {
         boolean b = false;
         RoomPitBean pitBean = roomInfoResp.getRoom_info().getPit_list().get(Integer.parseInt(message.getText().getPit_number()) - 1);
         pitBean.setUser_id(message.getText().getFromUserInfo().getUser_id() + "");
@@ -1179,8 +1209,9 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
             parentFragment.updateWheatStatus(pitBean, Integer.parseInt(message.getText().getPit_number()), true, b);
         }
     }
-    ///1004
-    public void event1004(RoomMessageEvent message){
+
+    /// 1004
+    public void event1004(RoomMessageEvent message) {
         boolean b = false;
         RoomPitBean pitBean = roomInfoResp.getRoom_info().getPit_list().get(Integer.parseInt(message.getText().getPit_number()) - 1);
         pitBean.setUser_id("");
@@ -1206,8 +1237,9 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
             parentFragment.updateWheatStatus(pitBean, Integer.parseInt(message.getText().getPit_number()), false, b);
         }
     }
-    ///1005
-    public void event1005(RoomMessageEvent message){
+
+    /// 1005
+    public void event1005(RoomMessageEvent message) {
         if (roomInfoRespPk == null || roomInfoRespPk.getPk_info() == null) {
             for (RoomPitBean pitBean : roomInfoResp.getRoom_info().getPit_list()) {
                 if (pitBean.getUser_id().equals(message.getText().getToUserInfo().getUser_id() + "")) {
@@ -1231,8 +1263,9 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
             }
         }
     }
-    ///1030
-    public void event1030(RoomMessageEvent message){
+
+    /// 1030
+    public void event1030(RoomMessageEvent message) {
         MvpPre.postRoomInfo(message.getRoomId(), roomInfoResp.getUser_info().getPit_number() + "", 3);
         if (message.getText().getType() == 1) {
             MvpPre.postRoomInfo(message.getText().getRoom_id(), roomInfoResp.getUser_info().getPit_number() + "", 1);
@@ -1246,33 +1279,54 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
             }
         }
     }
-    ///1031
-    public void event1031(RoomMessageEvent message){
+
+    /// 1031
+    public void event1031(RoomMessageEvent message) {
         countDownTime(Long.parseLong(message.getText().getPk_end_times()), 1);
         mBinding.btSta.setVisibility(INVISIBLE);
     }
-    ///1032
-    public void event1032(RoomMessageEvent message){
+
+    /// 1032
+    public void event1032(RoomMessageEvent message) {
         showCountDownDialog(requireContext(), message);
         ivitTop(message);
     }
-    ///1033
-    public void event1033(RoomMessageEvent message){
+
+    /// 1033
+    public void event1033(RoomMessageEvent message) {
         AgoraManager.getInstance(getContext()).leaveChannelEx(roomInfoRespPk.getRoom_info().getRoom_id(), SpUtil.getUserId());
         MvpPre.postRoomInfo(roomId, "0", 2);
         mBinding.imStart2.setVisibility(GONE);
         mBinding.imStart.setVisibility(GONE);
         roomInfoRespPk = null;
     }
-    ///1037
-    public void event1037(RoomMessageEvent message){
+
+    /// 1037
+    public void event1037(RoomMessageEvent message) {
         if (message.getText().getPit_number().equals("9") && message.getText().getFromUserInfo().getUser_id() == SpUtil.getUserId()) {
             queren();
         }
     }
 
-    ///1015
-    public void event1015(RoomMessageEvent message){
+    public void upRoonInfo(RoomInfoResp resp) {
+        this.roomInfoResp = resp;
+    }
+
+    public void event1035(RoomMessageEvent message) {
+        for (RoomPitBean pitBean : roomInfoResp.getRoom_info().getPit_list()) {
+            if (pitBean.getUser_id().equals(message.getText().getFromUserInfo().getUser_id() + "")) {
+                pitBean.setCharm(message.getText().getFromUserInfo().getCharm());
+                pitBean.setAvatar(message.getText().getFromUserInfo().getAvatar());
+                pitBean.setNickname(message.getText().getFromUserInfo().getNickname());
+                pitBean.setSex(message.getText().getFromUserInfo().getSex() + "");
+                pitBean.setDress(message.getText().getFromUserInfo().getDress());
+                wheatLayoutSingManager.updateSingleWheat(pitBean, Integer.parseInt(pitBean.getPit_number()));
+            }
+        }
+    }
+
+    /// 1015
+    public void event1015(RoomMessageEvent message) {
         String roomIdA = message.getText().getRoom_id_a();
         String roomIdB = message.getText().getRoom_id_b();
         String createValueA = message.getText().getCreate_value_a();
@@ -1292,6 +1346,7 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
 
         }
     }
+
     private void queren() {
         // 创建并显示确认对话框
         new ConfirmDialog(getActivity(),
@@ -1443,9 +1498,16 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
     public void onDestroyView() {
         super.onDestroyView();
         releaseCountDownTimer();
-        wheatLayoutSingManager.release();
-        wheatLayoutManager1.clear();
-        wheatLayoutManager2.clear();
+        if (wheatLayoutSingManager != null) {
+            wheatLayoutSingManager.release();
+        }
+        if (wheatLayoutManager1 != null) {
+            wheatLayoutManager1.clear();
+        }
+        if (wheatLayoutManager2 != null) {
+            wheatLayoutManager2.clear();
+        }
+
         mBinding.flexboxLayout.removeAllViews();
         mBinding.flexboxLayout2.removeAllViews();
     }
@@ -1454,9 +1516,15 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
     public void onDestroy() {
         super.onDestroy();
         releaseCountDownTimer();
-        wheatLayoutSingManager.release();
-        wheatLayoutManager1.clear();
-        wheatLayoutManager2.clear();
+        if (wheatLayoutSingManager != null) {
+            wheatLayoutSingManager.release();
+        }
+        if (wheatLayoutManager1 != null) {
+            wheatLayoutManager1.clear();
+        }
+        if (wheatLayoutManager2 != null) {
+            wheatLayoutManager2.clear();
+        }
         mBinding.flexboxLayout.removeAllViews();
         mBinding.flexboxLayout2.removeAllViews();
     }
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomPresenter.java b/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomPresenter.java
index fd22ec2..d9c8334 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomPresenter.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomPresenter.java
@@ -10,6 +10,7 @@ import com.xscm.moduleutil.bean.room.RoomInfoResp;
 import com.xscm.moduleutil.bean.room.RoomOnline;
 import com.xscm.moduleutil.http.APIException;
 import com.xscm.moduleutil.http.BaseObserver;
+import com.xscm.moduleutil.http.RetrofitClient;
 import com.xscm.moduleutil.listener.MessageListenerSingleton;
 import com.xscm.moduleutil.presenter.BasePresenter;
 import com.xscm.moduleutil.rtc.AgoraManager;
@@ -147,6 +148,9 @@ public class RoomPresenter extends BasePresenter<RoomContacts.View> implements R
 
     @Override
     public void applySong(String roomId) {
+        if (api== null){
+            api = RetrofitClient.getInstance();
+        }
         api.applySong(roomId, new BaseObserver<String>() {
 
             @Override
@@ -166,6 +170,9 @@ public class RoomPresenter extends BasePresenter<RoomContacts.View> implements R
 
     @Override
     public void agreeSong(String roomId, String type) {
+        if (api== null){
+            api = RetrofitClient.getInstance();
+        }
         api.agreeSong(roomId, type, new BaseObserver<String>() {
             @Override
             public void onSubscribe(Disposable d) {
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomSettingPresenter.java b/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomSettingPresenter.java
index d1cd488..6373b4d 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomSettingPresenter.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomSettingPresenter.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import com.example.moduleroom.contacts.RoomSettingContacts;
 import com.xscm.moduleutil.bean.room.RoomSettingBean;
 import com.xscm.moduleutil.http.BaseObserver;
+import com.xscm.moduleutil.http.RetrofitClient;
 import com.xscm.moduleutil.presenter.BasePresenter;
 
 import java.lang.ref.WeakReference;
@@ -20,6 +21,9 @@ public class RoomSettingPresenter extends BasePresenter<RoomSettingContacts.View
 
     @Override
     public void changeRoom(String roomId, String userId, int position, RoomSettingBean bean) {
+        if (api==null){
+            api= RetrofitClient.getInstance();
+        }
         api.changeRoom(roomId, userId, new BaseObserver<String>() {
             @Override
             public void onSubscribe(Disposable d) {
@@ -48,6 +52,9 @@ public class RoomSettingPresenter extends BasePresenter<RoomSettingContacts.View
 
     @Override
     public void changeRoomType(String roomId, String type) {
+        if (api==null){
+            api= RetrofitClient.getInstance();
+        }
         api.changeRoomType(roomId, type, new BaseObserver<String>() {
             @Override
             public void onSubscribe(Disposable d) {
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomUserPresenter.java b/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomUserPresenter.java
index cf162fc..23e5795 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomUserPresenter.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomUserPresenter.java
@@ -6,6 +6,7 @@ import com.example.moduleroom.contacts.RoomUserContacts;
 import com.xscm.moduleutil.bean.RelationCardBean;
 import com.xscm.moduleutil.bean.UserInfo;
 import com.xscm.moduleutil.http.BaseObserver;
+import com.xscm.moduleutil.http.RetrofitClient;
 import com.xscm.moduleutil.presenter.BasePresenter;
 
 import java.lang.ref.WeakReference;
@@ -22,6 +23,9 @@ public class RoomUserPresenter extends BasePresenter<RoomUserContacts.View> impl
 
     @Override
     public void getRoomUserInfo(String roomId, String userId) {
+        if (api==null){
+            api= RetrofitClient.getInstance();
+        }
         api.getRoomUserInfo(roomId, userId, new BaseObserver<UserInfo>() {
             @Override
             public void onSubscribe(Disposable d) {
@@ -30,6 +34,9 @@ public class RoomUserPresenter extends BasePresenter<RoomUserContacts.View> impl
 
             @Override
             public void onNext(UserInfo userInfo) {
+                if (MvpRef == null) {
+                    MvpRef = new WeakReference<>(mView);
+                }
                 MvpRef.get().getRoomUserInfo(userInfo);
             }
         });
@@ -37,6 +44,9 @@ public class RoomUserPresenter extends BasePresenter<RoomUserContacts.View> impl
 
     @Override
     public void downPit(String roomId, String pitNumber) {
+        if (api==null){
+            api= RetrofitClient.getInstance();
+        }
         api.downPit(roomId, pitNumber, new BaseObserver<String>() {
             @Override
             public void onSubscribe(Disposable d) {
@@ -45,6 +55,9 @@ public class RoomUserPresenter extends BasePresenter<RoomUserContacts.View> impl
 
             @Override
             public void onNext(String string) {
+                if (MvpRef == null) {
+                    MvpRef = new WeakReference<>(mView);
+                }
                 MvpRef.get().downPit();
             }
         });
@@ -52,6 +65,9 @@ public class RoomUserPresenter extends BasePresenter<RoomUserContacts.View> impl
 
     @Override
     public void hostUserPit(String roomId, String pitNumber, String userId, String type) {
+        if (api==null){
+            api= RetrofitClient.getInstance();
+        }
         api.hostUserPit(roomId, pitNumber, userId, type, new BaseObserver<String>() {
             @Override
             public void onSubscribe(Disposable d) {
@@ -60,6 +76,9 @@ public class RoomUserPresenter extends BasePresenter<RoomUserContacts.View> impl
 
             @Override
             public void onNext(String string) {
+                if (MvpRef == null) {
+                    MvpRef = new WeakReference<>(mView);
+                }
                 MvpRef.get().hostUserPit();
             }
         });
@@ -67,6 +86,9 @@ public class RoomUserPresenter extends BasePresenter<RoomUserContacts.View> impl
 
     @Override
     public void giveCoin(String user_id, String coin) {
+        if (api==null){
+            api= RetrofitClient.getInstance();
+        }
         api.giveCoin(user_id, coin, new BaseObserver<String>() {
 
             @Override
@@ -76,6 +98,9 @@ public class RoomUserPresenter extends BasePresenter<RoomUserContacts.View> impl
 
             @Override
             public void onNext(String s) {
+                if (MvpRef == null) {
+                    MvpRef = new WeakReference<>(mView);
+                }
                 MvpRef.get().giveCoin();
             }
         });
@@ -83,6 +108,9 @@ public class RoomUserPresenter extends BasePresenter<RoomUserContacts.View> impl
 
     @Override
     public void relationCard(String user_id) {
+        if (api==null){
+            api= RetrofitClient.getInstance();
+        }
         api.relationCard(user_id, new BaseObserver<RelationCardBean>() {
 
             @Override
@@ -102,6 +130,9 @@ public class RoomUserPresenter extends BasePresenter<RoomUserContacts.View> impl
 
     @Override
     public void topRelationCard(String id) {
+        if (api==null){
+            api= RetrofitClient.getInstance();
+        }
         api.topRelationCard(id, new BaseObserver<String>() {
 
             @Override
@@ -111,6 +142,9 @@ public class RoomUserPresenter extends BasePresenter<RoomUserContacts.View> impl
 
             @Override
             public void onNext(String s) {
+                if (MvpRef == null) {
+                    MvpRef = new WeakReference<>(mView);
+                }
                 MvpRef.get().topRelationCard(s);
             }
         });
@@ -118,6 +152,9 @@ public class RoomUserPresenter extends BasePresenter<RoomUserContacts.View> impl
 
     @Override
     public void deleteRelationCard(String id) {
+        if (api==null){
+            api= RetrofitClient.getInstance();
+        }
         api.deleteRelationCard(id, new BaseObserver<String>() {
 
             @Override
@@ -137,6 +174,9 @@ public class RoomUserPresenter extends BasePresenter<RoomUserContacts.View> impl
 
     @Override
     public void kickOutRoom(String roomId, String userId) {
+        if (api==null){
+            api= RetrofitClient.getInstance();
+        }
         api.kickOutRoom(roomId, userId, new BaseObserver<String>() {
             @Override
             public void onSubscribe(Disposable d) {
@@ -145,6 +185,9 @@ public class RoomUserPresenter extends BasePresenter<RoomUserContacts.View> impl
 
             @Override
             public void onNext(String string) {
+                if (MvpRef == null) {
+                    MvpRef = new WeakReference<>(mView);
+                }
                 MvpRef.get().kickOutRoom();
             }
         });
@@ -152,6 +195,9 @@ public class RoomUserPresenter extends BasePresenter<RoomUserContacts.View> impl
 
     @Override
     public void postHostAdd(String roomId, String userId, String type, String is_add) {
+        if (api==null){
+            api= RetrofitClient.getInstance();
+        }
         api.postHostAdd(roomId, userId, type, is_add, new BaseObserver<String>() {
 
 
@@ -162,6 +208,9 @@ public class RoomUserPresenter extends BasePresenter<RoomUserContacts.View> impl
 
             @Override
             public void onNext(String s) {
+                if (MvpRef == null) {
+                    MvpRef = new WeakReference<>(mView);
+                }
                 MvpRef.get().postHostAdd(s, type, is_add);
             }
 
@@ -170,6 +219,9 @@ public class RoomUserPresenter extends BasePresenter<RoomUserContacts.View> impl
 
     @Override
     public void setMutePit(String roomId, String user_id, String is_mute) {
+        if (api==null){
+            api= RetrofitClient.getInstance();
+        }
         api.setMutePit(roomId, user_id, is_mute, new BaseObserver<String>() {
             @Override
             public void onSubscribe(Disposable d) {
@@ -178,6 +230,9 @@ public class RoomUserPresenter extends BasePresenter<RoomUserContacts.View> impl
 
             @Override
             public void onNext(String string) {
+                if (MvpRef == null) {
+                    MvpRef = new WeakReference<>(mView);
+                }
                 MvpRef.get().setMutePit(user_id, is_mute);
             }
         });
@@ -185,6 +240,9 @@ public class RoomUserPresenter extends BasePresenter<RoomUserContacts.View> impl
 
     @Override
     public void addBlackList(String userId) {
+        if (api==null){
+            api= RetrofitClient.getInstance();
+        }
         api.addBlackList(userId, new BaseObserver<String>() {
             @Override
             public void onSubscribe(Disposable d) {
@@ -193,6 +251,9 @@ public class RoomUserPresenter extends BasePresenter<RoomUserContacts.View> impl
 
             @Override
             public void onNext(String string) {
+                if (MvpRef == null) {
+                    MvpRef = new WeakReference<>(mView);
+                }
                 MvpRef.get().addBlackList();
             }
         });
@@ -200,6 +261,9 @@ public class RoomUserPresenter extends BasePresenter<RoomUserContacts.View> impl
 
     @Override
     public void userGuanz(String userId, String type) {
+        if (api==null){
+            api= RetrofitClient.getInstance();
+        }
         api.userGuanz(userId, type, new BaseObserver<String>() {
             @Override
             public void onSubscribe(Disposable d) {
@@ -208,6 +272,9 @@ public class RoomUserPresenter extends BasePresenter<RoomUserContacts.View> impl
 
             @Override
             public void onNext(String s) {
+                if (MvpRef == null) {
+                    MvpRef = new WeakReference<>(mView);
+                }
                 MvpRef.get().userGuanzSuccess(s);
             }
         });
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/WheatPresenter.java b/moduleroom/src/main/java/com/example/moduleroom/presenter/WheatPresenter.java
index cc59215..c63f0dc 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/WheatPresenter.java
+++ b/moduleroom/src/main/java/com/example/moduleroom/presenter/WheatPresenter.java
@@ -7,11 +7,17 @@ import com.xscm.moduleutil.bean.room.RoomApplyListBean;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
 
+import java.lang.ref.WeakReference;
+
 import io.reactivex.disposables.Disposable;
 
 public class WheatPresenter extends BasePresenter<WheatContacts.View> implements WheatContacts.IRoomPre {
+
+    private WheatContacts.View mView;
+
     public WheatPresenter(WheatContacts.View view, Context context) {
         super(view, context);
+        this.mView = view;
     }
 
     @Override
@@ -25,6 +31,9 @@ public class WheatPresenter extends BasePresenter<WheatContacts.View> implements
 
             @Override
             public void onNext(RoomApplyListBean roomApplyListBeans) {
+                if (MvpRef==null){
+                    MvpRef=new WeakReference<>(mView);
+                }
                 MvpRef.get().roomApplyListBean(roomApplyListBeans);
             }
         });
@@ -40,6 +49,9 @@ public class WheatPresenter extends BasePresenter<WheatContacts.View> implements
 
             @Override
             public void onNext(String s) {
+                if (MvpRef==null){
+                    MvpRef=new WeakReference<>(mView);
+                }
                 MvpRef.get().clearApply();
             }
         });
@@ -55,6 +67,9 @@ public class WheatPresenter extends BasePresenter<WheatContacts.View> implements
 
             @Override
             public void onNext(String s) {
+                if (MvpRef==null){
+                    MvpRef=new WeakReference<>(mView);
+                }
                 MvpRef.get().agreePit();
             }
         });
@@ -70,6 +85,9 @@ public class WheatPresenter extends BasePresenter<WheatContacts.View> implements
 
             @Override
             public void onNext(String s) {
+                if (MvpRef==null){
+                    MvpRef=new WeakReference<>(mView);
+                }
                 MvpRef.get().agreePit();
             }
         });
@@ -85,6 +103,9 @@ public class WheatPresenter extends BasePresenter<WheatContacts.View> implements
 
             @Override
             public void onNext(String s) {
+                if (MvpRef==null){
+                    MvpRef=new WeakReference<>(mView);
+                }
                 MvpRef.get().agreePit();
             }
         });
@@ -100,6 +121,9 @@ public class WheatPresenter extends BasePresenter<WheatContacts.View> implements
 
             @Override
             public void onNext(String s) {
+                if (MvpRef==null){
+                    MvpRef=new WeakReference<>(mView);
+                }
                 MvpRef.get().applyPit();
             }
         });
@@ -116,6 +140,9 @@ public class WheatPresenter extends BasePresenter<WheatContacts.View> implements
 
             @Override
             public void onNext(String s) {
+                if (MvpRef==null){
+                    MvpRef=new WeakReference<>(mView);
+                }
                 MvpRef.get().giveGift();
             }
         });
diff --git a/moduleroom/src/main/res/layout/dialog_with_countdown.xml b/moduleroom/src/main/res/layout/dialog_with_countdown.xml
index 2ab56b8..ec6ec7f 100644
--- a/moduleroom/src/main/res/layout/dialog_with_countdown.xml
+++ b/moduleroom/src/main/res/layout/dialog_with_countdown.xml
@@ -66,7 +66,7 @@
             android:layout_width="wrap_content"
             android:layout_height="@dimen/dp_21"
             android:text="知道了"
-            android:textColor="@color/color_FF333333"
+            android:textColor="@color/white"
             android:textSize="@dimen/sp_14" />
 
         <TextView
@@ -75,6 +75,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:text="3"
+            android:textColor="@color/white"
             android:textSize="16sp" />
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/moduleroom/src/main/res/layout/fragment_friendship_room.xml b/moduleroom/src/main/res/layout/fragment_friendship_room.xml
index 9d73012..6fbb8d1 100644
--- a/moduleroom/src/main/res/layout/fragment_friendship_room.xml
+++ b/moduleroom/src/main/res/layout/fragment_friendship_room.xml
@@ -228,7 +228,7 @@
             android:textColor="@color/white"
             android:textSize="12sp"
             android:visibility="gone"
-            app:layout_constraintStart_toEndOf="@+id/tv_ys"
+            app:layout_constraintEnd_toStartOf="@+id/wheat_view5"
             app:layout_constraintTop_toTopOf="@+id/tv_ys"
             app:layout_constraintBottom_toBottomOf="@+id/tv_ys"
             tools:visibility="visible" />
@@ -261,7 +261,7 @@
             android:layout_height="wrap_content"
             app:layout_constraintStart_toEndOf="@+id/wheat_view2"
             app:layout_constraintTop_toBottomOf="@+id/wheat_view2"
-            android:layout_marginTop="-20dp"
+            android:layout_marginTop="-10dp"
             app:room_make_pic="@mipmap/jiaoy"
             app:room_make_wheat_number="3" />
 
diff --git a/moduleroom/src/main/res/layout/fragment_room.xml b/moduleroom/src/main/res/layout/fragment_room.xml
index 698ffc5..4bbea82 100644
--- a/moduleroom/src/main/res/layout/fragment_room.xml
+++ b/moduleroom/src/main/res/layout/fragment_room.xml
@@ -16,7 +16,7 @@
         <FrameLayout
             android:id="@+id/container"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="match_parent"
             android:clipChildren="false"
             android:clipToPadding="false"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/moduleroom/src/main/res/layout/fragment_room_auction.xml b/moduleroom/src/main/res/layout/fragment_room_auction.xml
index 7e39873..decbf57 100644
--- a/moduleroom/src/main/res/layout/fragment_room_auction.xml
+++ b/moduleroom/src/main/res/layout/fragment_room_auction.xml
@@ -133,7 +133,7 @@
                         android:layout_marginTop="@dimen/dp_15"
                         android:background="@mipmap/za_s"
                         android:gravity="center"
-                        android:text="0000"
+                        android:text="0"
                         android:textColor="#FFE8B0"
                         android:textSize="@dimen/sp_12"
 
@@ -491,14 +491,15 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-<!--        <ViewStub-->
-<!--            android:id="@+id/stub_buttons"-->
-<!--            android:layout_width="wrap_content"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:layout="@layout/top_overlay_buttons"-->
-<!--            app:layout_constraintEnd_toEndOf="parent"-->
-<!--            app:layout_constraintTop_toTopOf="parent"-->
-<!--            android:visibility="gone"/>-->
+        <ViewStub
+            android:id="@+id/stub_buttons"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout="@layout/top_overlay_buttons"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginTop="-30dp"
+            android:visibility="gone"/>
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/moduleroom/src/main/res/layout/fragment_wheat_feeding_dialog.xml b/moduleroom/src/main/res/layout/fragment_wheat_feeding_dialog.xml
index 3ebc99a..ba40a43 100644
--- a/moduleroom/src/main/res/layout/fragment_wheat_feeding_dialog.xml
+++ b/moduleroom/src/main/res/layout/fragment_wheat_feeding_dialog.xml
@@ -6,155 +6,151 @@
     <data>
 
     </data>
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@drawable/bg_room_gift"
-        android:paddingTop="@dimen/dp_16"
         android:paddingStart="@dimen/dp_16"
-        >
+        android:paddingTop="@dimen/dp_16">
 
         <TextView
             android:id="@+id/tv_1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
             android:text="优先通道(1/20)"
             android:textColor="@color/white"
             android:textSize="@dimen/sp_16"
-            />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <com.xscm.moduleutil.widget.GifAvatarOvalView
             android:id="@+id/im_1"
             android:layout_width="@dimen/dp_24"
             android:layout_height="@dimen/dp_24"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/tv_2"
             android:src="@mipmap/default_avatar"
-            />
+            app:layout_constraintEnd_toStartOf="@+id/tv_2"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <TextView
             android:id="@+id/tv_2"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/dp_19"
-            app:layout_constraintEnd_toStartOf="@+id/tv_3"
             android:layout_marginStart="@dimen/dp_2"
-            app:layout_constraintTop_toTopOf="parent"
             android:text="赠送***礼物插队"
             android:textColor="@color/white"
             android:textSize="@dimen/sp_14"
-            />
+            app:layout_constraintEnd_toStartOf="@+id/tv_3"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/tv_3"
             android:layout_width="@dimen/dp_44"
             android:layout_height="@dimen/dp_24"
-            app:layout_constraintEnd_toEndOf="parent"
             android:layout_marginEnd="@dimen/dp_16"
-            app:layout_constraintTop_toTopOf="parent"
-            android:text="赠送"
             android:gravity="center"
+            android:text="赠送"
             android:textColor="@color/color_FF333333"
             android:textSize="@dimen/sp_12"
-            />
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycle_view"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_114"
-            app:layout_constraintTop_toBottomOf="@+id/tv_1"
+            android:layout_marginTop="@dimen/dp_6"
             android:layout_marginEnd="@dimen/dp_16"
-            android:layout_marginTop="@dimen/dp_6"/>
+            app:layout_constraintTop_toBottomOf="@+id/tv_1" />
 
         <TextView
             android:id="@+id/tv_4"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@+id/recycle_view"
-            app:layout_constraintStart_toStartOf="parent"
             android:layout_marginTop="@dimen/dp_30"
             android:text="等待上台(1/20)"
             android:textColor="@color/white"
             android:textSize="@dimen/sp_16"
-            />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/recycle_view" />
 
         <TextView
             android:id="@+id/tv_qk"
             android:layout_width="@dimen/dp_44"
             android:layout_height="@dimen/dp_24"
-            app:layout_constraintStart_toEndOf="@+id/tv_4"
-            app:layout_constraintTop_toTopOf="@+id/tv_4"
-            android:background="@drawable/bg_r65_all_0dffb9"
             android:layout_marginStart="@dimen/dp_10"
-            android:text="清空"
+            android:background="@drawable/bg_r65_all_0dffb9"
             android:gravity="center"
+            android:text="清空"
             android:textColor="@color/color_FF333333"
             android:textSize="@dimen/sp_12"
-            />
+            app:layout_constraintStart_toEndOf="@+id/tv_4"
+            app:layout_constraintTop_toTopOf="@+id/tv_4" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycle_view2"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_114"
-            app:layout_constraintTop_toBottomOf="@+id/tv_4"
             android:layout_marginTop="@dimen/dp_6"
             android:layout_marginEnd="@dimen/dp_16"
-            />
+            app:layout_constraintTop_toBottomOf="@+id/tv_4" />
 
-        <TextView
-            android:id="@+id/tv_wheat_refuse"
-            android:layout_width="@dimen/dp_95"
-            android:layout_height="@dimen/dp_42"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            android:background="@mipmap/wheat_refuse"
-            android:layout_marginBottom="@dimen/dp_44"
-            android:layout_marginStart="@dimen/dp_16"/>
+        <!-- 按钮容器 -->
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/button_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_16"
+            android:layout_marginBottom="@dimen/dp_14"
+            app:layout_constraintBottom_toBottomOf="parent">
 
-        <TextView
-            android:id="@+id/tv_wheat_accept"
-            android:layout_width="@dimen/dp_95"
-            android:layout_height="@dimen/dp_42"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginEnd="@dimen/dp_16"
-            android:background="@drawable/bg_r53_0dffb9"
-            android:text="同意"
-            android:textSize="@dimen/sp_14"
-            android:gravity="center"
-            android:textColor="@color/color_FF333333"
-            android:layout_marginBottom="@dimen/dp_44"
-            />
+            <TextView
+                android:id="@+id/tv_wheat_refuse"
+                android:layout_width="@dimen/dp_95"
+                android:layout_height="@dimen/dp_42"
+                android:background="@mipmap/wheat_refuse"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
-            android:id="@+id/tv_wheat_sq"
-            android:layout_width="@dimen/dp_95"
-            android:layout_height="@dimen/dp_42"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:background="@drawable/bg_r53_33333"
-            android:text="申请"
-            android:textSize="@dimen/sp_14"
-            android:gravity="center"
-            android:textColor="@color/white"
-            android:layout_marginBottom="@dimen/dp_44"
-            android:layout_marginEnd="@dimen/dp_16"
-            android:visibility="gone"/>
+            <TextView
+                android:id="@+id/tv_wheat_accept"
+                android:layout_width="@dimen/dp_95"
+                android:layout_height="@dimen/dp_42"
+                android:background="@drawable/bg_r53_0dffb9"
+                android:gravity="center"
+                android:text="同意"
+                android:textColor="@color/color_FF333333"
+                android:textSize="@dimen/sp_14"
+                android:layout_marginEnd="@dimen/dp_20"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
-            android:id="@+id/tv_ljsq"
-            android:layout_width="@dimen/dp_300"
-            android:layout_height="@dimen/dp_42"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            android:background="@drawable/bg_r53_0dffb9"
-            android:text="立即申请"
-            android:textSize="@dimen/sp_14"
-            android:gravity="center"
-            android:textColor="@color/color_FF333333"
-            android:layout_marginBottom="@dimen/dp_44"
-            android:layout_marginStart="@dimen/dp_16"
-            android:visibility="gone"/>
+            <TextView
+                android:id="@+id/tv_wheat_sq"
+                android:layout_width="@dimen/dp_95"
+                android:layout_height="@dimen/dp_42"
+                android:background="@drawable/bg_r53_33333"
+                android:gravity="center"
+                android:text="申请"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_14"
+                android:visibility="gone"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
+            <TextView
+                android:id="@+id/tv_ljsq"
+                android:layout_width="@dimen/dp_300"
+                android:layout_height="@dimen/dp_42"
+                android:background="@drawable/bg_r53_0dffb9"
+                android:gravity="center"
+                android:text="立即申请"
+                android:textColor="@color/color_FF333333"
+                android:textSize="@dimen/sp_14"
+                android:visibility="gone"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/moduleroom/src/main/res/layout/room_concern_dialog.xml b/moduleroom/src/main/res/layout/room_concern_dialog.xml
index b8c882f..e99317f 100644
--- a/moduleroom/src/main/res/layout/room_concern_dialog.xml
+++ b/moduleroom/src/main/res/layout/room_concern_dialog.xml
@@ -15,9 +15,9 @@
 
         <com.xscm.moduleutil.widget.GifAvatarOvalView
             android:id="@+id/image"
-            android:layout_width="46dp"
-            android:layout_height="46dp"
-            android:layout_marginStart="@dimen/dp_40"
+            android:layout_width="@dimen/dp_50"
+            android:layout_height="@dimen/dp_50"
+            android:layout_marginStart="@dimen/dp_28"
             android:src="@mipmap/default_avatar"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -33,46 +33,55 @@
             android:gravity="center"
             android:text="昵称"
             android:textColor="@color/color_FF333333"
-            android:textSize="16sp"
+            android:textSize="@dimen/sp_12"
             app:layout_constraintEnd_toEndOf="@+id/image"
             app:layout_constraintStart_toStartOf="@+id/image"
             app:layout_constraintTop_toBottomOf="@+id/image" />
 
-        <FrameLayout
-            android:layout_width="@dimen/dp_150"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_40"
-            app:layout_constraintBottom_toBottomOf="@+id/tv_name1"
-            app:layout_constraintEnd_toStartOf="@+id/image2"
-            app:layout_constraintStart_toStartOf="@+id/image"
-            app:layout_constraintTop_toTopOf="@+id/image">
+<!--        <FrameLayout-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            app:layout_constraintBottom_toBottomOf="@+id/tv_name1"-->
+<!--            app:layout_constraintEnd_toStartOf="@+id/image2"-->
+<!--            app:layout_constraintStart_toEndOf="@+id/image"-->
+<!--            app:layout_constraintTop_toTopOf="@+id/image">-->
 
             <ImageView
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_60"
-                android:scaleType="fitXY"
-                android:src="@mipmap/kagx" />
+                android:layout_height="wrap_content"
+                android:scaleType="fitCenter"
+                android:src="@mipmap/kagx"
+                app:layout_constraintBottom_toBottomOf="@+id/image"
+                app:layout_constraintEnd_toStartOf="@+id/image2"
+                app:layout_constraintStart_toEndOf="@+id/image"
+                app:layout_constraintTop_toTopOf="@+id/image"/>
 
             <TextView
                 android:id="@+id/tv_zhi"
-                android:layout_width="@dimen/dp_65"
+                android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_12"
                 android:layout_gravity="center"
                 android:layout_marginStart="@dimen/dp_4"
                 android:background="@drawable/bg_r40_fe8ec8"
                 android:gravity="center"
-                android:text="关系"
+                android:paddingStart="@dimen/dp_5"
+                android:paddingEnd="@dimen/dp_5"
+                tools:text="关系"
                 android:textColor="@color/white"
-                android:textSize="10sp" />
+                android:textSize="10sp"
+                app:layout_constraintBottom_toBottomOf="@+id/image"
+                app:layout_constraintEnd_toStartOf="@+id/image2"
+                app:layout_constraintStart_toEndOf="@+id/image"
+                app:layout_constraintTop_toTopOf="@+id/image"/>
 
 
-        </FrameLayout>
+<!--        </FrameLayout>-->
 
         <com.xscm.moduleutil.widget.GifAvatarOvalView
             android:id="@+id/image2"
-            android:layout_width="46dp"
-            android:layout_height="46dp"
-            android:layout_marginEnd="@dimen/dp_70"
+            android:layout_width="@dimen/dp_50"
+            android:layout_height="@dimen/dp_50"
+            android:layout_marginEnd="@dimen/dp_28"
             android:src="@mipmap/default_avatar"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -88,7 +97,7 @@
             android:gravity="center"
             android:text="昵称"
             android:textColor="@color/color_FF333333"
-            android:textSize="16sp"
+            android:textSize="@dimen/sp_12"
             app:layout_constraintEnd_toEndOf="@+id/image2"
             app:layout_constraintStart_toStartOf="@+id/image2"
             app:layout_constraintTop_toBottomOf="@+id/image2" />
@@ -100,8 +109,9 @@
             android:layout_marginTop="@dimen/dp_10"
             android:text="关系列表"
             android:textColor="@color/color_FF333333"
+            android:textStyle="bold"
             android:textSize="16sp"
-            app:layout_constraintStart_toStartOf="@+id/tv_name1"
+            app:layout_constraintStart_toStartOf="@+id/image"
             app:layout_constraintTop_toBottomOf="@+id/tv_name1" />
 
         <androidx.recyclerview.widget.RecyclerView
@@ -118,34 +128,35 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/dp_10"
             android:orientation="horizontal"
+            android:gravity="center"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/rl_list">
+           >
 
-            <Button
-                android:id="@+id/btn_cancel"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/dp_30"
-                android:layout_marginStart="@dimen/dp_10"
-                android:layout_weight="1"
-                android:background="@drawable/bg_r45_0000"
-                android:text="取消"
-                android:textColor="@color/color_FFFFF0F0"
-                android:textSize="12sp" />
+<!--            <Button-->
+<!--                android:id="@+id/btn_cancel"-->
+<!--                android:layout_width="0dp"-->
+<!--                android:layout_height="@dimen/dp_30"-->
+<!--                android:layout_marginStart="@dimen/dp_10"-->
+<!--                android:layout_weight="1"-->
+<!--                android:background="@drawable/bg_r45_0000"-->
+<!--                android:text="取消"-->
+<!--                android:textColor="@color/color_FFFFF0F0"-->
+<!--                android:textSize="12sp"-->
+<!--                android:visibility="gone"/>-->
 
-            <View
-                android:layout_width="@dimen/dp_0"
-                android:layout_height="match_parent"
-                android:layout_weight="1" />
+<!--            <View-->
+<!--                android:layout_width="@dimen/dp_0"-->
+<!--                android:layout_height="match_parent"-->
+<!--                android:layout_weight="1"-->
+<!--                android:visibility="gone"/>-->
 
             <Button
                 android:id="@+id/btn_action"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_30"
                 android:layout_marginStart="@dimen/dp_10"
-                android:layout_marginEnd="@dimen/dp_40"
-                android:layout_weight="1"
                 android:background="@drawable/cs"
                 android:text="确认"
                 android:textColor="@color/white"
diff --git a/moduleroom/src/main/res/layout/room_dialog_tuner.xml b/moduleroom/src/main/res/layout/room_dialog_tuner.xml
index e3cf6bd..7c9ae30 100644
--- a/moduleroom/src/main/res/layout/room_dialog_tuner.xml
+++ b/moduleroom/src/main/res/layout/room_dialog_tuner.xml
@@ -18,144 +18,147 @@
         android:paddingBottom="@dimen/dp_20">
 
 
-        <RelativeLayout
-            android:id="@+id/rl_title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
 
-            <TextView
-                android:id="@+id/tv_title"
-                android:layout_width="wrap_content"
+            <RelativeLayout
+                android:id="@+id/rl_title"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:layout_alignParentStart="true"
-                android:text="调音台"
-                android:textColor="@color/color_FFFFF0F0"
-                android:textSize="@dimen/sp_14"
-                android:textStyle="bold" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="@dimen/dp_8"
-                android:layout_toLeftOf="@+id/sw_monitoring"
-                android:text="耳返"
-                android:textColor="@color/color_FFFFF0F0"
-                android:textSize="@dimen/sp_12" />
-
-            <Switch
-                android:id="@+id/sw_monitoring"
-                android:layout_width="@dimen/dp_37"
-                android:layout_height="@dimen/dp_20"
-                android:layout_alignParentEnd="true"
-                android:background="@drawable/room_tuner_selector_switch"
-                android:thumb="@android:color/transparent"
-                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_bias="0.005"
-                tools:ignore="UseSwitchCompatOrMaterialXml" />
-        </RelativeLayout>
-        <TextView
-            android:id="@+id/tv_seekbar_value"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_21"
-            android:text="人声40%"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/sp_14"
-            android:layout_marginTop="@dimen/dp_20"
-           app:layout_constraintStart_toStartOf="@+id/rl_title"
-            app:layout_constraintTop_toBottomOf="@+id/rl_title"
-            android:textAlignment="center"/>
-        <SeekBar
-            android:id="@+id/seekBar1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            app:layout_constraintTop_toBottomOf="@+id/tv_seekbar_value"
-            app:layout_constraintStart_toStartOf="@id/tv_seekbar_value"
-            app:layout_constraintEnd_toEndOf="@+id/rl_title"
-            android:max="100"
-            android:secondaryProgressTint="@color/colorAccent"
-            android:maxHeight="@dimen/dp_15"
-            android:minHeight="@dimen/dp_15"
-            android:splitTrack="false"
-            android:progressDrawable="@drawable/picture_layer_progress"
-            android:thumb="@drawable/picture_sb_thumb"/>
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
 
-        <TextView
-            android:id="@+id/tv_seekbar_value2"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_21"
-            android:text="伴奏40%"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/sp_14"
-            android:layout_marginTop="@dimen/dp_20"
-            app:layout_constraintStart_toStartOf="@+id/seekBar1"
-            app:layout_constraintTop_toBottomOf="@+id/seekBar1"
-            android:textAlignment="center"/>
-        <SeekBar
-            android:id="@+id/seekBar2"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            app:layout_constraintTop_toBottomOf="@+id/tv_seekbar_value2"
-            app:layout_constraintStart_toStartOf="@+id/tv_seekbar_value2"
-            app:layout_constraintEnd_toEndOf="@+id/rl_title"
-            android:max="100"
-            android:splitTrack="false"
-            android:secondaryProgressTint="@color/colorAccent"
-            android:maxHeight="@dimen/dp_15"
-            android:minHeight="@dimen/dp_15"
-            android:progressDrawable="@drawable/picture_layer_progress"
-            android:thumb="@drawable/picture_sb_thumb"/>
+                <TextView
+                    android:id="@+id/tv_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentStart="true"
+                    android:layout_centerInParent="true"
+                    android:text="调音台"
+                    android:textColor="@color/color_FFFFF0F0"
+                    android:textSize="@dimen/sp_14"
+                    android:textStyle="bold" />
 
-        <TextView
-            android:id="@+id/tv_hunxiang"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_21"
-            android:text="混响"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/sp_14"
-            android:layout_marginTop="@dimen/dp_20"
-            app:layout_constraintStart_toStartOf="@+id/seekBar2"
-            app:layout_constraintTop_toBottomOf="@+id/seekBar2"
-            android:textAlignment="center"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="@dimen/dp_8"
+                    android:layout_toLeftOf="@+id/sw_monitoring"
+                    android:text="耳返"
+                    android:textColor="@color/color_FFFFF0F0"
+                    android:textSize="@dimen/sp_12" />
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rv_effect_style_list"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_10"
-            app:layout_constraintTop_toBottomOf="@+id/tv_hunxiang"
-            tools:listitem="@layout/room_rv_item_tuner" />
+                <Switch
+                    android:id="@+id/sw_monitoring"
+                    android:layout_width="@dimen/dp_37"
+                    android:layout_height="@dimen/dp_20"
+                    android:layout_alignParentEnd="true"
+                    android:background="@drawable/room_tuner_selector_switch"
+                    android:thumb="@android:color/transparent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_bias="0.005"
+                    tools:ignore="UseSwitchCompatOrMaterialXml" />
+            </RelativeLayout>
 
-        <TextView
-            android:id="@+id/tv_biansheng"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_21"
-            android:text="变声"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/sp_14"
-            android:layout_marginTop="@dimen/dp_20"
-            app:layout_constraintStart_toStartOf="@+id/rv_effect_style_list"
-            app:layout_constraintTop_toBottomOf="@+id/rv_effect_style_list"
-            android:textAlignment="center"
-            android:visibility="gone"/>
+            <TextView
+                android:id="@+id/tv_seekbar_value"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_21"
+                android:layout_marginTop="@dimen/dp_20"
+                android:text="人声40%"
+                android:textAlignment="center"
+                android:textColor="#FFFFFF"
+                android:textSize="@dimen/sp_14"
+                app:layout_constraintStart_toStartOf="@+id/rl_title"
+                app:layout_constraintTop_toBottomOf="@+id/rl_title" />
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rv_effect_style_list2"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_10"
-            app:layout_constraintTop_toBottomOf="@+id/tv_biansheng"
-            tools:listitem="@layout/room_rv_item_tuner"
-            android:visibility="gone"/>
+            <SeekBar
+                android:id="@+id/seekBar1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:max="100"
+                android:maxHeight="@dimen/dp_15"
+                android:minHeight="@dimen/dp_15"
+                android:progressDrawable="@drawable/picture_layer_progress"
+                android:secondaryProgressTint="@color/colorAccent"
+                android:splitTrack="false"
+                android:thumb="@drawable/picture_sb_thumb"
+                app:layout_constraintEnd_toEndOf="@+id/rl_title"
+                app:layout_constraintStart_toStartOf="@id/tv_seekbar_value"
+                app:layout_constraintTop_toBottomOf="@+id/tv_seekbar_value" />
 
+            <TextView
+                android:id="@+id/tv_seekbar_value2"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_21"
+                android:layout_marginTop="@dimen/dp_20"
+                android:text="伴奏40%"
+                android:textAlignment="center"
+                android:textColor="#FFFFFF"
+                android:textSize="@dimen/sp_14"
+                app:layout_constraintStart_toStartOf="@+id/seekBar1"
+                app:layout_constraintTop_toBottomOf="@+id/seekBar1" />
+
+            <SeekBar
+                android:id="@+id/seekBar2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:max="100"
+                android:maxHeight="@dimen/dp_15"
+                android:minHeight="@dimen/dp_15"
+                android:progressDrawable="@drawable/picture_layer_progress"
+                android:secondaryProgressTint="@color/colorAccent"
+                android:splitTrack="false"
+                android:thumb="@drawable/picture_sb_thumb"
+                app:layout_constraintEnd_toEndOf="@+id/rl_title"
+                app:layout_constraintStart_toStartOf="@+id/tv_seekbar_value2"
+                app:layout_constraintTop_toBottomOf="@+id/tv_seekbar_value2" />
+
+            <TextView
+                android:id="@+id/tv_hunxiang"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_21"
+                android:layout_marginTop="@dimen/dp_20"
+                android:text="混响"
+                android:textAlignment="center"
+                android:textColor="#FFFFFF"
+                android:textSize="@dimen/sp_14"
+                app:layout_constraintStart_toStartOf="@+id/seekBar2"
+                app:layout_constraintTop_toBottomOf="@+id/seekBar2" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_effect_style_list"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_10"
+                app:layout_constraintTop_toBottomOf="@+id/tv_hunxiang"
+                tools:listitem="@layout/room_rv_item_tuner" />
+
+            <TextView
+                android:id="@+id/tv_biansheng"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_21"
+                android:layout_marginTop="@dimen/dp_20"
+                android:text="变声"
+                android:textAlignment="center"
+                android:textColor="#FFFFFF"
+                android:textSize="@dimen/sp_14"
+                android:visibility="gone"
+                app:layout_constraintStart_toStartOf="@+id/rv_effect_style_list"
+                app:layout_constraintTop_toBottomOf="@+id/rv_effect_style_list" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_effect_style_list2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_10"
+                android:visibility="gone"
+                app:layout_constraintTop_toBottomOf="@+id/tv_biansheng"
+                tools:listitem="@layout/room_rv_item_tuner" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
 
diff --git a/moduleroom/src/main/res/layout/room_top.xml b/moduleroom/src/main/res/layout/room_top.xml
index c246840..e4d9745 100644
--- a/moduleroom/src/main/res/layout/room_top.xml
+++ b/moduleroom/src/main/res/layout/room_top.xml
@@ -157,7 +157,7 @@
 
         <RelativeLayout
             android:id="@+id/btn_notice"
-            android:layout_width="@dimen/dp_55"
+            android:layout_width="@dimen/dp_65"
             android:layout_height="@dimen/dp_22"
             android:layout_alignTop="@id/btn_ranking"
             android:layout_marginStart="@dimen/dp_12"
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/AlbumDetailActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/AlbumDetailActivity.java
index 00c51f0..88d1947 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/AlbumDetailActivity.java
+++ b/modulevocal/src/main/java/com/example/modulevocal/activity/AlbumDetailActivity.java
@@ -8,6 +8,7 @@ import android.graphics.Color;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -256,25 +257,30 @@ public class AlbumDetailActivity extends BaseMvpActivity<AlbumDetailPresenter, A
         dialog.setContentView(com.xscm.moduleutil.R.layout.bottom_sheet_recyclerview);
 
         RecyclerView recyclerView = dialog.findViewById(com.xscm.moduleutil.R.id.rv_options);
-        Button btnCancel = dialog.findViewById(com.xscm.moduleutil.R.id.btn_cancel);
-        Button btnConfirm = dialog.findViewById(com.xscm.moduleutil.R.id.btn_confirm);
-
+        View btnCancel = dialog.findViewById(com.xscm.moduleutil.R.id.btn_cancel);
+        View btnConfirm = dialog.findViewById(com.xscm.moduleutil.R.id.btn_confirm);
+        TextView tvTitle = dialog.findViewById(com.xscm.moduleutil.R.id.tv_title);
+        tvTitle.setText("选择相册");
         assert recyclerView != null;
         recyclerView.setLayoutManager(new GridLayoutManager(this,4));
         SingleChoiceAdapter sadapter = new SingleChoiceAdapter();
         recyclerView.setAdapter(sadapter);
         sadapter.setNewData(data);
-        btnCancel.setOnClickListener(v -> dialog.dismiss());
+        // 添加空值检查以提高代码健壮性
+        if (btnCancel != null) {
+            btnCancel.setOnClickListener(v -> dialog.dismiss());
+        }
+        if (btnConfirm != null) {
+            btnConfirm.setOnClickListener(v -> {
+                AlbumBean selectedItem = sadapter.getSelectedItem();
 
-        btnConfirm.setOnClickListener(v -> {
-            AlbumBean selectedItem = sadapter.getSelectedItem();
-
-            if (selectedItem != null) {
-                MvpPre.moveAlbum(adapter.getSelectedPhotoIdsAsString(), selectedItem.getId());
-            }
-            dialog.dismiss();
-        });
+                if (selectedItem != null) {
+                    MvpPre.moveAlbum(adapter.getSelectedPhotoIdsAsString(), selectedItem.getId());
+                }
+                dialog.dismiss();
+            });
 
+        }
         dialog.show();
     }
 
@@ -317,7 +323,11 @@ public class AlbumDetailActivity extends BaseMvpActivity<AlbumDetailPresenter, A
     private void updateZanButtonUI(AlbumBean albumBean) {
         if (albumBean.getIs_like().equals("0")) {
             mBinding.zanImage.setImageResource(com.xscm.moduleutil.R.mipmap.shousz); // 已点赞图标
-            mBinding.dyComment.setText(Integer.parseInt(albumBean.getLike_num()) - 1 + "");
+            if (Integer.parseInt(albumBean.getLike_num())==0){
+                mBinding.dyComment.setText("0");
+            }else {
+                mBinding.dyComment.setText(Integer.parseInt(albumBean.getLike_num()) - 1 + "");
+            }
         } else {
             mBinding.zanImage.setImageResource(com.xscm.moduleutil.R.mipmap.showszc); // 未点赞图标
             mBinding.dyComment.setText(Integer.parseInt(albumBean.getLike_num()) + 1 + "");
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/WithdrawalActivity.java b/modulevocal/src/main/java/com/example/modulevocal/activity/WithdrawalActivity.java
index b413afa..938c403 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/WithdrawalActivity.java
+++ b/modulevocal/src/main/java/com/example/modulevocal/activity/WithdrawalActivity.java
@@ -89,6 +89,10 @@ public class WithdrawalActivity extends BaseMvpActivity<WithdrawalPresenter, Act
                 ToastUtils.show("请选择提现方式");
                 return;
             }
+            if (mBinding.etCustomAmount.getText().toString().equals("0")|| mBinding.etCustomAmount.getText().toString().equals("") || mBinding.etCustomAmount.getText().toString().isEmpty()){
+                ToastUtils.show("提现金额不能为0");
+                return;
+            }
             showSecondaryVerificationDialog();
         });
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/UserGiftWallFragment.java b/modulevocal/src/main/java/com/example/modulevocal/fragment/UserGiftWallFragment.java
index 4f060c9..15fdf2e 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/fragment/UserGiftWallFragment.java
+++ b/modulevocal/src/main/java/com/example/modulevocal/fragment/UserGiftWallFragment.java
@@ -65,7 +65,8 @@ public class UserGiftWallFragment extends BaseMvpFragment<UserGiftWallPresenter,
             rows = 6;
             columns = 4;
         }
-
+        rows = 6;
+        columns = 4;
         mUserGiftWallAdapter = new UserGiftWallAdapter();
         PagerGridLayoutManager layoutManager = new PagerGridLayoutManager(rows, columns, PagerGridLayoutManager.VERTICAL);
         mBinding.recyclerView.setLayoutManager(layoutManager);
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/AlbumDetailPresenter.java b/modulevocal/src/main/java/com/example/modulevocal/presenter/AlbumDetailPresenter.java
index 89e1c31..a3be85f 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/AlbumDetailPresenter.java
+++ b/modulevocal/src/main/java/com/example/modulevocal/presenter/AlbumDetailPresenter.java
@@ -10,13 +10,16 @@ import com.xscm.moduleutil.presenter.BasePresenter;
 import com.xscm.moduleutil.utils.oss.OSSOperUtils;
 
 import java.io.File;
+import java.lang.ref.WeakReference;
 import java.util.List;
 
 import io.reactivex.disposables.Disposable;
 
 public class AlbumDetailPresenter extends BasePresenter<AlbumDetailConacts.View> implements AlbumDetailConacts.IMePre {
+    private AlbumDetailConacts.View mView;
     public AlbumDetailPresenter(AlbumDetailConacts.View view, Context context) {
         super(view, context);
+        this.mView = view;
     }
 
     @Override
@@ -89,6 +92,9 @@ public class AlbumDetailPresenter extends BasePresenter<AlbumDetailConacts.View>
 
             @Override
             public void onNext(List<AlbumBean> albumBeans) {
+                if (MvpRef==null){
+                    MvpRef=new WeakReference<>(mView);
+                }
                 MvpRef.get().getAlbumList(albumBeans);
             }
         });
diff --git a/modulevocal/src/main/res/layout/activity_bind_card.xml b/modulevocal/src/main/res/layout/activity_bind_card.xml
index a6235f8..c5df067 100644
--- a/modulevocal/src/main/res/layout/activity_bind_card.xml
+++ b/modulevocal/src/main/res/layout/activity_bind_card.xml
@@ -10,23 +10,24 @@
 
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
         <com.xscm.moduleutil.widget.CustomTopBar
             android:id="@+id/top_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:layout_constraintTop_toTopOf="parent" />
+            />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycle_view"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@id/top_bar"
+            android:layout_height="match_parent"
+
             android:layout_marginTop="@dimen/dp_12"
             />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/modulevoice/src/main/java/com/example/modulevoice/fragment/VoiceCategoryFragment.java b/modulevoice/src/main/java/com/example/modulevoice/fragment/VoiceCategoryFragment.java
index e697d75..80cceef 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/fragment/VoiceCategoryFragment.java
+++ b/modulevoice/src/main/java/com/example/modulevoice/fragment/VoiceCategoryFragment.java
@@ -37,9 +37,11 @@ import com.xscm.moduleutil.event.RoomGiftRunable;
 import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.stx.xhb.xbanner.XBanner;
+import com.xscm.moduleutil.utils.logger.DataLogger;
 import com.zhpan.bannerview.constants.PageStyle;
 
 import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Logger;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
@@ -194,37 +196,33 @@ public class VoiceCategoryFragment extends BaseMvpFragment<VoiceCategoryPresente
 
     }
 
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onEvent(MqttBean event) {
-        if (event!=null) {
-
-            List<MqttBean> cachedMqttBeans = RoomGiftRunable.getMqttCache();
-            if (cachedMqttBeans == null || cachedMqttBeans.isEmpty()) {
-                mBinding.rl.setVisibility(GONE);
-            } else {
-                mBinding.rl.setVisibility(View.VISIBLE);
-            }
-            if (mqttList == null) {
-                mqttList = new ArrayList<>();
-                info = new ArrayList<>();
-            }
-            mqttList.clear();
-            info.clear();
-            // 处理缓存数据
-            for (MqttBean mqttBean : cachedMqttBeans) {
-                // 处理每一条 mqttBean 数据
-                mqttList.add(mqttBean.getList());
-                info.add(mqttBean.getList().getFromUserName() + "送给" + mqttBean.getList().getToUserName() + "\n" + mqttBean.getList().getGiftName());
-            }
-
-            mBinding.marqueeView.startWithList(info);
-        }else {
-            mBinding.rl.setVisibility(View.GONE);
-        }
-    }
+//    @Subscribe(threadMode = ThreadMode.MAIN)
+//    public void onEvent(MqttBean event) {
+//
+//            List<MqttBean> cachedMqttBeans = RoomGiftRunable.getMqttCache();
+//            if (cachedMqttBeans == null || cachedMqttBeans.isEmpty()) {
+//                mBinding.rl.setVisibility(GONE);
+//            } else {
+//                mBinding.rl.setVisibility(View.VISIBLE);
+//            }
+//            if (mqttList == null) {
+//                mqttList = new ArrayList<>();
+//                info = new ArrayList<>();
+//            }
+//            mqttList.clear();
+//            info.clear();
+//            // 处理缓存数据
+//            for (MqttBean mqttBean : cachedMqttBeans) {
+//                // 处理每一条 mqttBean 数据
+//                mqttList.add(mqttBean.getList());
+//                info.add(mqttBean.getList().getFromUserName() + "送给" + mqttBean.getList().getToUserName() + "\n" + mqttBean.getList().getGiftName());
+//            }
+//
+//            mBinding.marqueeView.startWithList(info);
+//    }
 
     public void onEvent1() {
-
+        try {
             List<MqttBean> cachedMqttBeans = RoomGiftRunable.getMqttCache();
             if (cachedMqttBeans == null || cachedMqttBeans.isEmpty()) {
                 mBinding.rl.setVisibility(GONE);
@@ -245,6 +243,10 @@ public class VoiceCategoryFragment extends BaseMvpFragment<VoiceCategoryPresente
             }
 
             mBinding.marqueeView.startWithList(info);
+        }catch (Exception e){
+            DataLogger.LogUtil.d("onEvent1");
+        }
+
     }
 
     //
diff --git a/modulevoice/src/main/res/layout/fragment_voice_category.xml b/modulevoice/src/main/res/layout/fragment_voice_category.xml
index 7ceb611..b177a90 100644
--- a/modulevoice/src/main/res/layout/fragment_voice_category.xml
+++ b/modulevoice/src/main/res/layout/fragment_voice_category.xml
@@ -112,18 +112,17 @@
 
             <com.google.android.material.tabs.TabLayout
                 android:id="@+id/sliding_tab_layout"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_30"
                 android:layout_marginLeft="@dimen/dp_16"
                 android:layout_marginTop="@dimen/dp_12"
                 android:layout_marginRight="@dimen/dp_16"
-
                 app:tabIndicatorHeight="0dp"
                 app:tabSelectedTextColor="@color/white"
                 app:tabTextColor="#F1ECFF"
                 app:tabTextAppearance="@style/CustomTabTextAppearance"
                 app:tabIndicatorFullWidth="true"
-                app:tabMode="fixed"/>
+                app:tabMode="scrollable"/>
 <!--                app:tl_indicator_corner_radius="@dimen/dp_3"-->
 <!--                app:tl_indicator_drawable="@mipmap/tab_dy"-->
 <!--                app:tl_indicator_height="@dimen/dp_6"-->