From e3bad8ddab7a1ebdbc44fed84574a78b3904e95b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Tue, 13 Jan 2026 19:59:17 +0800
Subject: [PATCH] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9=E7=BA=A2=E5=8C=85?=
 =?UTF-8?q?=E5=A3=B0=E9=9F=B3=E5=92=8C=E8=BD=AC=E7=9B=98=E5=A3=B0=E9=9F=B3?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=98=E6=88=900.04=202=EF=BC=9A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=EF=BC=8C=E5=B1=95=E7=A4=BA=E7=9A=84=E4=BA=8B?=
 =?UTF-8?q?200=E6=9D=A1=EF=BC=8C=E6=B8=85=E9=99=A4=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=EF=BC=8C=E6=B8=85=E9=99=A4=E5=89=8D100=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xscm/modulemain/BaseMvpActivity.java    |  2 +-
 .../activity/room/activity/RoomActivity.kt           |  9 ++++++++-
 .../activity/room/fragment/ChatRoomFragment.java     |  3 +++
 .../com/xscm/modulemain/adapter/EaseChatAdapter.java | 12 ++++++------
 .../xscm/modulemain/dialog/GiftLotteryDialog.java    |  2 +-
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java b/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java
index 9657ff8a..e297f9e1 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java
@@ -749,7 +749,7 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
                         isRedPacketMediaPrepared = true;
                         mp.start();
                     });
-                    redPacketMediaPlayer.setVolume(0.2f, 0.2f); // 设置音量
+                    redPacketMediaPlayer.setVolume(0.1f, 0.1f); // 设置音量
                     redPacketMediaPlayer.setOnCompletionListener(mp -> {
                         // 播放完成后重置，以便下次重新播放
                         try {
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 0b026229..347f88c6 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
@@ -1639,10 +1639,11 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
 //                if (mRoomInfoResp?.user_info?.pit_number != 0) {
 //                    MvpPre?.downPit(roomId, mRoomInfoResp?.user_info?.pit_number.toString())
 //                }
+
                 AgoraManager.getInstance().lastRoomId = roomId
                 MvpPre?.getRoomIn(messageEvent.text.room_id, "")
+                MessageExListenerSingleton.getInstance().joinGroup(messageEvent.text.room_id)
                 if (publicScreenFragment != null) {
-                    MessageExListenerSingleton.getInstance().joinGroup(messageEvent.text.room_id)
                     publicScreenFragment?.setupExMessageListener()
                     publicScreenFragment?.setIsPriRoom(
                         true,
@@ -4037,6 +4038,12 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             publicScreenFragment?.clearExMessageListener()
             publicScreenFragment?.setIsPriRoom(false, arrayListOf())
         }
+
+//        if (publicScreenFragment != null) {
+//            publicScreenFragment!!.onFragmentShowDestroy()
+//            publicScreenFragment = null
+//        }
+
 //        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 11f0130e..5e2b190a 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
@@ -179,6 +179,9 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
             MessageExListenerSingleton.getInstance().removePublicScreenMessageListener(messageExListener);
             messageListener = null;
         }
+        if (easeChatAdapter != null){
+            easeChatAdapter.clearData();
+        }
         mIsPriRoom = true;
         // 创建并添加监听器
         messageExListener = message -> {
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 289fb6fc..e7b15d6c 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java
@@ -561,9 +561,9 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter<EMMessageInfo, Ba
         if (shouldAddToAdapter(data)) {
             super.addData(data);
             // 确保适配器数据量也不超过限制
-            if (mData.size() > 100) {
-                int removeCount = mData.size() - 100;
-                mData.subList(0, removeCount).clear();
+            if (mData.size() > 200) {
+                int removeCount = mData.size() - 200;
+                mData.subList(0, 100).clear();
                 notifyDataSetChanged();
             }
         }
@@ -595,9 +595,9 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter<EMMessageInfo, Ba
     }
 
     private void trimListToMaxSize(List<EMMessageInfo> list) {
-        if (list.size() > 100) {
-            int removeCount = list.size() - 100;
-            list.subList(0, removeCount).clear();
+        if (list.size() > 200) {
+            int removeCount = list.size() - 200;
+            list.subList(0, 100).clear();
         }
     }
 
diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/GiftLotteryDialog.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/GiftLotteryDialog.java
index 6cdc1e0b..998b78b1 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/GiftLotteryDialog.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/GiftLotteryDialog.java
@@ -759,7 +759,7 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
                 // 从assets目录加载音频文件
                 AssetFileDescriptor afd = getContext().getAssets().openFd(fileName);
                 player = new MediaPlayer();
-                player.setVolume(0.2f,0.2f);
+                player.setVolume(0.04f,0.04f);
                 player.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
                 player.prepare();
             } catch (IOException e) {