diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
index 990dd082..a0f0a00c 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java
@@ -807,7 +807,7 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
             AppLifecycleUtil.onAppFrontGround();
         }
         if (playId!=null && !playId.equals("")){
-            RetrofitClient.getInstance().userRoomBack(playId, "2");
+//            RetrofitClient.getInstance().userRoomBack(playId, "2");
         }
         activityCount++;
     }
@@ -822,7 +822,7 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
             }
 
             if (playId!=null && !playId.equals("")){
-                RetrofitClient.getInstance().userRoomBack(playId, "1");
+//                RetrofitClient.getInstance().userRoomBack(playId, "1");
             }
 
             AppLifecycleUtil.onAppBackGround();
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/service/IMConnectionService.java b/BaseModule/src/main/java/com/xscm/moduleutil/service/IMConnectionService.java
index c24d6b35..276928b7 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/service/IMConnectionService.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/service/IMConnectionService.java
@@ -36,7 +36,7 @@ public class IMConnectionService extends Service {
             Log.d(TAG, "IM connect success");
             if (CommonAppContext.getInstance().playId != null) {
                 LogUtils.e("@@@", ""+CommonAppContext.getInstance().playId);
-                RetrofitClient.getInstance().roomUserReconnect(CommonAppContext.getInstance().playId);
+//                RetrofitClient.getInstance().roomUserReconnect(CommonAppContext.getInstance().playId);
             }
         }
 
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/service/MqttConnect.java b/BaseModule/src/main/java/com/xscm/moduleutil/service/MqttConnect.java
index 6aa9e201..70499211 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/service/MqttConnect.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/service/MqttConnect.java
@@ -46,11 +46,10 @@ public class MqttConnect {
         this.clientId = clientId;
 
         // 这里是你自己需要订阅的主题
-        shutdown = "qx_room_topic"; // 关机
-        update_app = "qx_xunlehui"; // 发送更新APP
-//        qx_hour_ranking = "qx_hour_ranking";
-        qx_hour_ranking = "qx_hour_ranking";
-        qx_redpacket_arrive = "qx_redpacket_arrive";
+        shutdown = "qx_room_topic"; // 房间飘屏
+        update_app = "qx_xunlehui"; // 巡乐会飘屏
+        qx_hour_ranking = "qx_hour_ranking";//小时榜飘屏
+        qx_redpacket_arrive = "qx_redpacket_arrive"; //红包飘屏的主题
 
         ArrayList<String> topicList = new ArrayList<>();
         topicList.add(shutdown);
diff --git a/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java b/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java
index 8f230d47..53e395dc 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java
@@ -277,7 +277,7 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
             if (CommonAppContext.getInstance().playId != null) {
                 LogUtils.e("@@@", "重连成功");
                 LogUtils.e("@@@", "" + CommonAppContext.getInstance().playId);
-                RetrofitClient.getInstance().roomUserReconnect(CommonAppContext.getInstance().playId);
+//                RetrofitClient.getInstance().roomUserReconnect(CommonAppContext.getInstance().playId);
             }
         }
 
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
index 3f5ec047..8f8c87f0 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
@@ -886,8 +886,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
                 // 输出当前的播放ID信息
                 LogUtils.e("@@@", "" + CommonAppContext.getInstance().playId)
                 // 调用RetrofitClient执行房间用户重连操作
-                RetrofitClient.getInstance()
-                    .roomUserReconnect(CommonAppContext.getInstance().playId)
+//                RetrofitClient.getInstance().roomUserReconnect(CommonAppContext.getInstance().playId)
             }
         }
 
@@ -1434,19 +1433,19 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             LogUtils.e("messageEvent!!.text.type" + messageEvent.text.type)
             CommonAppContext.getInstance().onlineMap[userId ?: ""] = messageEvent.text.type
             if (mRoomInfoResp != null && mRoomInfoResp?.room_info != null) {
-
-                when(mRoomInfoResp?.room_info?.type_id) {
-                    "1","3","4","8" -> {
-                        if (mRoomInfoResp?.room_info?.label_id == "1") {
-//                        roomFragment!!.SingSongEvent(messageEvent)
-                        } else {
-                            roomFragment!!.handleRoomMessage(messageEvent)
-                        }
-                    }
-                    "2","7","9","10" -> {
-                        roomFragment!!.handleRoomMessage(messageEvent)
-                    }
-                }
+                roomFragment!!.handleRoomMessage(messageEvent)
+//                when(mRoomInfoResp?.room_info?.type_id) {
+//                    "1","3","4","8" -> {
+//                        if (mRoomInfoResp?.room_info?.label_id == "1") {
+////                        roomFragment!!.SingSongEvent(messageEvent)
+//                        } else {
+//                            roomFragment!!.handleRoomMessage(messageEvent)
+//                        }
+//                    }
+//                    "2","7","9","10" -> {
+//                        roomFragment!!.handleRoomMessage(messageEvent)
+//                    }
+//                }
             }
 
             CommonAppContext.getInstance().getOnlineMap()