From 725add62ac4c10a363027c4a37d4cfa3d26474cd Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Sat, 17 Jan 2026 01:08:24 +0800
Subject: [PATCH] fix bugs.

---
 .../xscm/modulemain/activity/room/activity/RoomActivity.kt | 7 +++++++
 .../java/com/xscm/modulemain/adapter/EaseChatAdapter.java  | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

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 5efe8727..6141733f 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
@@ -2494,6 +2494,13 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             MvpPre!!.quitRoom2(messageEvent.roomId, SpUtil.getUserId().toString() + "")
             quit()
             jiaR()
+
+            //酒吧房用
+            if (publicScreenFragment != null) {
+                publicScreenFragment?.mIsPriRoom = false
+                publicScreenFragment?.clearExMessageListener()
+                publicScreenFragment?.setIsPriRoom(false, arrayListOf())
+            }
         }
         mBinding?.ivMic?.setImageResource(com.xscm.moduleutil.R.mipmap.room_microphone_off)
     }
diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java b/MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java
index a81a467c..eb45671a 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java
@@ -236,7 +236,7 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter<EMMessageInfo, Ba
                 tvName.clearAnimation();
                 tvName.setText(emMessage.getText().getFromUserInfo().getNickname());
 
-                if (!emMessage.getText().getFromUserInfo().getNickname_color().isEmpty() || emMessage.getText().getFromUserInfo().getUser_id() == 20137) {
+                if (!emMessage.getText().getFromUserInfo().getNickname_color().isEmpty()) {
                     emMessage.getText().getFromUserInfo().setNickname_color("#ff5878");
                     tvName.setStartColor(Color.parseColor(emMessage.getText().getFromUserInfo().getNickname_color()));
                     tvName.setShineColor(Color.parseColor(emMessage.getText().getFromUserInfo().getNickname_color()));