From 8264974d85471cdc94ed73c23e91cc1cc9ad1f16 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Fri, 9 Jan 2026 12:48:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=92=E5=90=A7=E4=BA=A4=E5=8F=8B=E6=88=BF?=
 =?UTF-8?q?=20=E6=B6=88=E6=81=AF=E6=98=BE=E7=A4=BA=203=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modulemain/activity/room/activity/RoomActivity.kt    | 4 ++--
 .../activity/room/fragment/ChatRoomFragment.java         | 3 ++-
 .../com/xscm/modulemain/adapter/EaseChatAdapter.java     | 9 +++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

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 73df89c2..feb02443 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
@@ -1612,7 +1612,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
                 if (publicScreenFragment != null) {
                     MessageExListenerSingleton.getInstance().joinGroup(messageEvent.text.room_id)
                     publicScreenFragment?.setupExMessageListener()
-                    publicScreenFragment?.setIsPriRoom(true)
+                    publicScreenFragment?.setIsPriRoom(true, arrayListOf(messageEvent.text.user_id,messageEvent.text.meet_user_id))
                 }
             }
         }else if (msgType == EMMessageInfo.QXRoomMessageTypeFlirtatiousRoomPush) {//酒吧房抱麦推送
@@ -3932,7 +3932,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         if (publicScreenFragment != null) {
             publicScreenFragment?.mIsPriRoom = false
             publicScreenFragment?.clearExMessageListener()
-            publicScreenFragment?.setIsPriRoom(false)
+            publicScreenFragment?.setIsPriRoom(false, arrayListOf())
         }
         MvpPre?.getRoomIn(AgoraManager.getInstance().lastRoomId, "")
         AgoraManager.getInstance().lastRoomId = ""
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java
index 95c14eba..47dc455b 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java
@@ -298,9 +298,10 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
         }
     }
 
-    public void setIsPriRoom(boolean isPriRoom) {
+    public void setIsPriRoom(boolean isPriRoom,List<String> userIdList) {
         if (easeChatAdapter != null) {
             easeChatAdapter.isPriRoom = isPriRoom;
+            easeChatAdapter.userIdList = userIdList;
             easeChatAdapter.notifyDataSetChanged();
         }
     }
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 0762d85f..d8a3e52b 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java
@@ -71,6 +71,7 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter<EMMessageInfo, Ba
     private String messageNameColor = "#00C8FF";//名称的颜色
     private String messageGiftColor = "#FFE309";//礼物的颜色
     public boolean isPriRoom = false;
+    public List<String> userIdList = new ArrayList<>();
 
     public EaseChatAdapter() {
         super(null);
@@ -205,7 +206,7 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter<EMMessageInfo, Ba
                 helper.getView(com.xscm.moduleutil.R.id.tv_content).setVisibility(View.VISIBLE);
                 TextView tv1Content = helper.getView(com.xscm.moduleutil.R.id.tv_content);
                 if (isPriRoom){
-                    if (emMessage.getRoomId().equals(AgoraManager.getInstance().getLastRoomId())){
+                    if (emMessage.getRoomId().equals(AgoraManager.getInstance().getLastRoomId()) && !userIdList.contains(emMessage.getText().getFromUserInfo().getUser_id()+"")){
                         tv1Content.setTextColor(Color.parseColor("#FF6B647E"));
                         helper.setText(com.xscm.moduleutil.R.id.tv_content, emMessage.getText().getText());
                     }else {
@@ -395,9 +396,9 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter<EMMessageInfo, Ba
                 TextView tvContent = helper.getView(com.xscm.moduleutil.R.id.tv_content);
                 ShineTextView tvContentName = helper.getView(com.xscm.moduleutil.R.id.tv_name);
                 if (isPriRoom){
-                    if (emMessage.getRoomId().equals(AgoraManager.getInstance().getLastRoomId())){
+                    if (emMessage.getRoomId().equals(AgoraManager.getInstance().getLastRoomId()) && !userIdList.contains(emMessage.getText().getFromUserInfo().getUser_id()+"")){
                         tvContent.setTextColor(Color.parseColor("#FF6B647E"));
-                       setTvNameColor(tvContentName,"#FF6B647E");
+                        setTvNameColor(tvContentName,"#FF6B647E");
                     }else {
                         tvContent.setTextColor(Color.parseColor("#FFFFFF"));
                         setTvNameColor(tvContentName,"#FFFFFF");
@@ -412,7 +413,7 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter<EMMessageInfo, Ba
                 helper.getView(com.xscm.moduleutil.R.id.tv_content).setVisibility(View.VISIBLE);
                 TextView tv3Content = helper.getView(com.xscm.moduleutil.R.id.tv_content);
                 if (isPriRoom){
-                    if (emMessage.getRoomId().equals(AgoraManager.getInstance().getLastRoomId())){
+                    if (emMessage.getRoomId().equals(AgoraManager.getInstance().getLastRoomId()) && !userIdList.contains(emMessage.getText().getFromUserInfo().getUser_id()+"")){
                         tv3Content.setTextColor(Color.parseColor("#FF6B647E"));
                         helper.setText(com.xscm.moduleutil.R.id.tv_content, emMessage.getText().getText());
                     }else {