From 90077d24f687d3db73d3fe89b5abb4d47b776a43 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Wed, 17 Dec 2025 09:31:54 +0800
Subject: [PATCH] =?UTF-8?q?77=20=20=E7=BA=A2=E5=8C=85=E9=9D=9E=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E6=88=BF=E9=97=B4=E7=9A=84=E4=B8=8D=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xscm/moduleutil/utils/QXRedPacketManager.java  | 10 ++++++----
 .../modulemain/activity/room/activity/RoomActivity.kt  |  8 +++++---
 app/build.gradle                                       |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/QXRedPacketManager.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/QXRedPacketManager.java
index 2e57a881..d9214ddb 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/QXRedPacketManager.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/QXRedPacketManager.java
@@ -50,15 +50,16 @@ public class QXRedPacketManager {
      *
      * @param redPackets 红包模型列表
      */
-    public void addRedPackets(List<RedPacketInfo> redPackets) {
+    public void addRedPackets(String roomId,List<RedPacketInfo> redPackets) {
         if (redPackets == null || redPackets.isEmpty()) {
             return;
         }
+        this.redPackets.entrySet().removeIf(entry ->
+                !(entry.getValue().getRoom_id()+"").equals(roomId));
 
         for (RedPacketInfo model : redPackets) {
             this.redPackets.put(model.getRedpacket_id(), model);
         }
-
         // 在添加数据后启动定时器（如果尚未启动）
         startCheckTimer();
         if (this.delegate != null && this.delegate instanceof QXRedPacketManagerDelegate) {
@@ -71,11 +72,12 @@ public class QXRedPacketManager {
      *
      * @param redPacket 红包模型
      */
-    public void addRedPacket(RedPacketInfo redPacket) {
+    public void addRedPacket(String roomId,RedPacketInfo redPacket) {
         if (redPacket == null || redPacket.getRedpacket_id() == null) {
             return;
         }
-
+        this.redPackets.entrySet().removeIf(entry ->
+                !(entry.getValue().getRoom_id()+"").equals(roomId));
         this.redPackets.put(redPacket.getRedpacket_id(), redPacket);
 
         // 在添加数据后启动定时器（如果尚未启动）
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 48857d91..9e73e1de 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
@@ -1498,7 +1498,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             xlhDjs(messageEvent.text.end_time)
 
         } else if (msgType == EMMessageInfo.QXRoomMessageTypeQXRoomMessageRed) {
-            qxRedPacketManager!!.addRedPacket(messageEvent.text.redpacketInfo)
+            qxRedPacketManager!!.addRedPacket(roomId,messageEvent.text.redpacketInfo)
         } else if (msgType == EMMessageInfo.QXRoomMessageTypeQXRoomMessageRedRemove) {
             qxRedPacketManager!!.removeRedPacket(messageEvent.text.redpacket_id)
         } else if (msgType == EMMessageInfo.QXRoomMessageTypeSongerNum ||   //房间点歌数量变化
@@ -3711,7 +3711,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
 
         MvpPre?.quitRoom(roomId, SpUtil.getUserId().toString())
 
-
         ClickUtils.clearAllClickRecords()
         AgoraManager.getInstance().cleanup()
         roomId = roomId2
@@ -4105,7 +4104,10 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
 
     override fun roomRedPackets(list: MutableList<RedPacketInfo>?) {
         if (list != null) {
-            qxRedPacketManager!!.addRedPackets(list!!)
+            mBinding?.drvRed?.visibility = View.VISIBLE
+            qxRedPacketManager!!.addRedPackets(roomId,list!!)
+        }else{
+            mBinding?.drvRed?.visibility = View.GONE
         }
     }
 
diff --git a/app/build.gradle b/app/build.gradle
index 6d81d2b1..1fc4a0e4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -118,7 +118,7 @@ android {
                             def versionCode = variant.versionCode
                             // 获取当前时间戳（格式：yyyyMMddHHmmss）
                             def buildTimes = new Date().format("yyyy-MM-dd-HH-mm")
-                            def fileName = "羽声_${versionName}_${versionCode}_${buildTimes}.apk"
+                            def fileName = "yusheng_${versionName}_${versionCode}_${buildTimes}.apk"
                             output.outputFileName = fileName
                         }
                     }