From 2e61fa5e4d7da3aefa533d01db1e78fe44346d36 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Fri, 9 Jan 2026 09:38:42 +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=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/room/activity/RoomActivity.kt    |  6 +-
 .../room/fragment/ChatRoomFragment.java       |  6 +-
 .../modulemain/adapter/EaseChatAdapter.java   | 61 +++++++++++++++----
 app/proguard/creash.txt                       | 34 +++++------
 4 files changed, 72 insertions(+), 35 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 8682bdef..d96a33d6 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
@@ -2287,8 +2287,10 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         }
 
         //酒吧房用
-        if (publicScreenFragment != null)
-            publicScreenFragment?.isPriRoom = false
+        if (publicScreenFragment != null) {
+            publicScreenFragment?.mIsPriRoom = false
+            publicScreenFragment?.setIsPriRoom(false)
+        }
     }
 
     private fun updateCharmForAllPitBeans(charm: String) {
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 3163598a..734b3948 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
@@ -74,7 +74,7 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
     private MessageListenerSingleton.PublicScreenMessageListener messageListener;
     private MessageExListenerSingleton.PublicScreenMessageListener messageExListener;
     @Setter
-    public boolean isPriRoom = false;
+    public boolean mIsPriRoom = false;
     // 在需要的地方调用 Activity 的方法
     public void someMethod() {
         easeChatAdapter.clearData();
@@ -179,7 +179,7 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
             MessageExListenerSingleton.getInstance().removePublicScreenMessageListener(messageExListener);
             messageListener = null;
         }
-        isPriRoom = true;
+        mIsPriRoom = true;
         // 创建并添加监听器
         messageExListener = message -> {
             // 确保在主线程更新 UI
@@ -529,7 +529,7 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
         if (message.getRoomId() == null) {
             return;
         }
-        if (!isPriRoom){
+        if (!mIsPriRoom){
             if (roomId == null || (!message.getRoomId().contains(roomId) && message.getMsgType() != 125)) {
                 return;
             }
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 6c2bb850..0762d85f 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java
@@ -203,7 +203,19 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter<EMMessageInfo, Ba
         switch (helper.getItemViewType()) {
             case 1:
                 helper.getView(com.xscm.moduleutil.R.id.tv_content).setVisibility(View.VISIBLE);
-                helper.setText(com.xscm.moduleutil.R.id.tv_content, getSpannable(emMessage));
+                TextView tv1Content = helper.getView(com.xscm.moduleutil.R.id.tv_content);
+                if (isPriRoom){
+                    if (emMessage.getRoomId().equals(AgoraManager.getInstance().getLastRoomId())){
+                        tv1Content.setTextColor(Color.parseColor("#FF6B647E"));
+                        helper.setText(com.xscm.moduleutil.R.id.tv_content, emMessage.getText().getText());
+                    }else {
+                        tv1Content.setTextColor(Color.parseColor("#FFFFFFFF"));
+                        helper.setText(com.xscm.moduleutil.R.id.tv_content, getSpannable(emMessage));
+                    }
+                }else {
+                    tv1Content.setTextColor(Color.parseColor("#FFFFFFFF"));
+                    helper.setText(com.xscm.moduleutil.R.id.tv_content, getSpannable(emMessage));
+                }
 
                 break;
             case 2:
@@ -379,23 +391,48 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter<EMMessageInfo, Ba
                     // 清除可能存在的异步加载任务
                     Glide.with(mContext).clear(emojiImageView);
                 }
+
+                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())){
+                        tvContent.setTextColor(Color.parseColor("#FF6B647E"));
+                       setTvNameColor(tvContentName,"#FF6B647E");
+                    }else {
+                        tvContent.setTextColor(Color.parseColor("#FFFFFF"));
+                        setTvNameColor(tvContentName,"#FFFFFF");
+                    }
+                }else {
+                    tvContent.setTextColor(Color.parseColor("#FFFFFF"));
+                    setTvNameColor(tvContentName,"#FFFFFF");
+                }
+
                 break;
             case 3:
                 helper.getView(com.xscm.moduleutil.R.id.tv_content).setVisibility(View.VISIBLE);
-                helper.setText(com.xscm.moduleutil.R.id.tv_content, getSpannable(emMessage));
+                TextView tv3Content = helper.getView(com.xscm.moduleutil.R.id.tv_content);
+                if (isPriRoom){
+                    if (emMessage.getRoomId().equals(AgoraManager.getInstance().getLastRoomId())){
+                        tv3Content.setTextColor(Color.parseColor("#FF6B647E"));
+                        helper.setText(com.xscm.moduleutil.R.id.tv_content, emMessage.getText().getText());
+                    }else {
+                        tv3Content.setTextColor(Color.parseColor("#FFFFFFFF"));
+                        helper.setText(com.xscm.moduleutil.R.id.tv_content, getSpannable(emMessage));
+                    }
+                }else {
+                    tv3Content.setTextColor(Color.parseColor("#FFFFFFFF"));
+                    helper.setText(com.xscm.moduleutil.R.id.tv_content, getSpannable(emMessage));
+                }
                 break;
         }
+    }
 
-        if (isPriRoom){
-            if (emMessage.getRoomId().equals(AgoraManager.getInstance().getLastRoomId())){
-                helper.itemView.setAlpha(0.4f);
-            }else {
-                helper.itemView.setAlpha(1f);
-            }
-        }else {
-            helper.itemView.setAlpha(1f);
-        }
-
+    private void setTvNameColor(ShineTextView tvName,String color){
+        tvName.setStartColor(Color.parseColor(color));
+        tvName.setShineColor(Color.parseColor(color));
+        tvName.setEndColor(Color.parseColor(color));
+        tvName.setShine(true);
+        tvName.setShineType(1);
     }
 
 
diff --git a/app/proguard/creash.txt b/app/proguard/creash.txt
index 192792ed..efcbd3ae 100644
--- a/app/proguard/creash.txt
+++ b/app/proguard/creash.txt
@@ -1,19 +1,17 @@
-java.lang.NullPointerException: Attempt to invoke virtual method 'java.lang.String com.xscm.moduleutil.bean.room.RoomOwnerBean.getUser_id()' on a null object reference
-	at com.xscm.modulemain.activity.room.fragment.RoomCabinFragment.initView(SourceFile:73)
-	at com.xscm.moduleutil.base.BaseFragment.onViewCreated(SourceFile:17)
-	at com.xscm.moduleutil.base.BaseMvpFragment.onViewCreated(SourceFile:7)
-	at com.xscm.moduleutil.base.BaseRoomFragment.onViewCreated(SourceFile:1)
-	at androidx.fragment.app.Fragment.performViewCreated(SourceFile:5)
-	at androidx.fragment.app.c0.f(SourceFile:263)
-	at androidx.fragment.app.c0.m(SourceFile:119)
-	at androidx.fragment.app.FragmentManager.m0(SourceFile:231)
-	at androidx.fragment.app.FragmentManager.F1(SourceFile:82)
-	at androidx.fragment.app.FragmentManager.j0(SourceFile:22)
-	at androidx.fragment.app.FragmentManager$f.run(SourceFile:4)
-	at android.os.Handler.handleCallback(Handler.java:883)
-	at android.os.Handler.dispatchMessage(Handler.java:100)
-	at android.os.Looper.loop(Looper.java:230)
-	at android.app.ActivityThread.main(ActivityThread.java:8018)
+java.lang.NullPointerException: Attempt to invoke virtual method 'android.content.res.Resources$Theme android.content.Context.getTheme()' on a null object reference
+	at android.app.Dialog.<init>(Dialog.java:353)
+	at android.app.Dialog.<init>(Dialog.java:326)
+	at com.xscm.moduleutil.dialog.f.<init>(SourceFile:1)
+	at com.xscm.moduleutil.base.CommonAppContext.n(SourceFile:28)
+	at com.xscm.moduleutil.http.t$c6.onFailure(SourceFile:14)
+	at retrofit2.DefaultCallAdapterFactory$ExecutorCallbackCall$1.lambda$onFailure$1(SourceFile:3)
+	at retrofit2.DefaultCallAdapterFactory$ExecutorCallbackCall$1.a(SourceFile:1)
+	at retrofit2.b.run(SourceFile:1)
+	at android.os.Handler.handleCallback(Handler.java:996)
+	at android.os.Handler.dispatchMessage(Handler.java:110)
+	at android.os.Looper.loopOnce(Looper.java:210)
+	at android.os.Looper.loop(Looper.java:302)
+	at android.app.ActivityThread.main(ActivityThread.java:9702)
 	at java.lang.reflect.Method.invoke(Native Method)
-	at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:526)
-	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:1034
\ No newline at end of file
+	at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:601)
+	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:1062)