From 716cafc62b767991c26322ba828e516cb7c501bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Fri, 16 Jan 2026 17:55:18 +0800
Subject: [PATCH] =?UTF-8?q?1=EF=BC=9A=E4=BC=98=E5=8C=96=E5=B0=8F=E9=BB=91?=
 =?UTF-8?q?=E5=B1=8B=E9=80=80=E5=87=BA=E6=88=BF=E9=97=B4=E5=90=8E=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E5=A4=A7=E6=88=BF=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xscm/moduleutil/listener/MessageExListenerSingleton.java | 5 +----
 .../xscm/modulemain/activity/room/activity/RoomActivity.kt   | 4 ++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/listener/MessageExListenerSingleton.java b/BaseModule/src/main/java/com/xscm/moduleutil/listener/MessageExListenerSingleton.java
index 05147429..3a7860cf 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/listener/MessageExListenerSingleton.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/listener/MessageExListenerSingleton.java
@@ -93,7 +93,6 @@ public class MessageExListenerSingleton {
 
     // 同时修改 removePublicScreenMessageListener 方法
     public void removePublicScreenMessageListener(PublicScreenMessageListener listener) {
-        mRoomId = "";
         if (listener == null) {
             return;
         }
@@ -205,8 +204,6 @@ public class MessageExListenerSingleton {
         if (TextUtils.isEmpty(roomId)) {
             return;
         }
-        if (Objects.equals(mRoomId, roomId))
-            return;
         synchronized (groupOperationLock) {
             if (isGroupOperationInProgress) {
                 // 如果有操作正在进行，延迟执行
@@ -389,7 +386,7 @@ public class MessageExListenerSingleton {
                 public void onReceiveRESTCustomData(String groupID, byte[] customData) {
                     String message = "";
                     try {
-
+                        LogUtils.e("收到群自定义消息",groupID);
                         message = new String(customData, StandardCharsets.UTF_8);
                         LogUtils.e("收到群自定义消息(系统)：" + message);
                     } catch (Exception e) {
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 33365859..67ed1bd5 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
@@ -4055,6 +4055,10 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             "@@@",
             "上一个房间的roonid" + AgoraManager.getInstance().lastRoomId
         )
+        // TODO: 添加预防，当出现不能退出小黑屋的时候，执行这个操作 
+        if (AgoraManager.getInstance().lastRoomId.isNotEmpty()){
+            jiaR()
+        }
         mBinding?.ivMic?.setImageResource(com.xscm.moduleutil.R.mipmap.room_microphone_off)
         //酒吧房用
         if (publicScreenFragment != null) {