From b201787513744e51295d8d28185dcc607c9abdf6 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Wed, 14 Jan 2026 20:28:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=92=E5=90=A7=E6=88=BF=E5=B0=8F=E9=BB=91?=
 =?UTF-8?q?=E5=B1=8B=E7=A6=81=E6=AD=A2=E6=92=AD=E6=94=BEcp=20and=20jia=5Fj?=
 =?UTF-8?q?ia.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/room/activity/RoomActivity.kt    | 58 ++++++++++---------
 1 file changed, 32 insertions(+), 26 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 d20fab71..a046d03f 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
@@ -598,7 +598,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
 
         mBinding?.rlEffects?.setOnClickListener { view: View ->
             this.onClick(
-                 view
+                view
             )
         }
 
@@ -1095,7 +1095,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         mBinding?.ivPrivateSet?.tag = "1"
         goneAll()
 
-        SpUtil.getInstance().setIntValue("is_pk",mRoomInfoResp?.room_info?.is_pk?:1)
+        SpUtil.getInstance().setIntValue("is_pk", mRoomInfoResp?.room_info?.is_pk ?: 1)
     }
 
 
@@ -1588,19 +1588,22 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             }
         } else if (msgType == EMMessageInfo.QXRoomMessageTypeCPText) {
             LogUtils.e("CPText", messageEvent.text.rights_icon)
-            if (messageEvent.text.rights_icon.isNotEmpty()) {
-                GiftDisplayManager.getInstance().setupDisplayView(mBinding?.giftContainer)
-                QXGiftPlayerManager.getInstance(this).displayCPView(
-                    messageEvent.text.fromUserInfo.avatar,
-                    messageEvent.text.toUserInfo.avatar,
-                    messageEvent.text.fromUserInfo.nickname,
-                    messageEvent.text.toUserInfo.nickname,
-                    messageEvent.text.rights_icon
-                )
+            if (mRoomInfoResp?.room_info?.room_id.equals(messageEvent.roomId)) {
+                if (messageEvent.text.rights_icon.isNotEmpty()) {
+                    GiftDisplayManager.getInstance().setupDisplayView(mBinding?.giftContainer)
+                    QXGiftPlayerManager.getInstance(this).displayCPView(
+                        messageEvent.text.fromUserInfo.avatar,
+                        messageEvent.text.toUserInfo.avatar,
+                        messageEvent.text.fromUserInfo.nickname,
+                        messageEvent.text.toUserInfo.nickname,
+                        messageEvent.text.rights_icon
+                    )
+                }
+                //TODO================ CP入场不触发播放 临时添加===============
+                scheduleEnterActivityOnce()
             }
 
-            //TODO================ CP入场不触发播放 临时添加===============
-            scheduleEnterActivityOnce()
+
         } else if (msgType == EMMessageInfo.QXRoomMessageTypeSignStartText) {
             roomFragment?.handleRoomMessage(messageEvent)
             softRebuildUI()
@@ -2117,17 +2120,20 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         if (roomId != roomMessageEvent.roomId) {
             return
         }
-        if (roomMessageEvent.text.jia_jia != null && roomMessageEvent.text.jia_jia.isNotEmpty()) {
-            val gift = GiftBean()
-            gift.gift_id = ""
-            gift.play_image = roomMessageEvent.text.jia_jia
-            setupEffectView()
-            QXGiftPlayerManager.getInstance(this)
-                .displayFullEffectView(roomMessageEvent.text.jia_jia)
-        }
 
-        //TODO================ 坐骑入场不触发播放 临时添加===============
-        scheduleEnterActivityOnce()
+        if (mRoomInfoResp?.room_info?.room_id.equals(roomMessageEvent.roomId)) {
+            if (roomMessageEvent.text.jia_jia != null && roomMessageEvent.text.jia_jia.isNotEmpty()) {
+                val gift = GiftBean()
+                gift.gift_id = ""
+                gift.play_image = roomMessageEvent.text.jia_jia
+                setupEffectView()
+                QXGiftPlayerManager.getInstance(this)
+                    .displayFullEffectView(roomMessageEvent.text.jia_jia)
+            }
+
+            //TODO================ 坐骑入场不触发播放 临时添加===============
+            scheduleEnterActivityOnce()
+        }
 
         MvpPre?.getRoomOnline(roomId, "1", "10")
 
@@ -2801,7 +2807,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
             val fragment = RoomPkDialogFragment.newInstance(
                 roomId,
                 SpUtil.getUserId().toString() + "",
-                SpUtil.getInstance().getIntValue("is_pk",1)
+                SpUtil.getInstance().getIntValue("is_pk", 1)
             )
 
             LogUtils.e("pk_info", "id == R.id.rl_pk   ${mRoomInfoResp?.room_info?.is_pk!!}")
@@ -3073,9 +3079,9 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         mBinding?.rlPrivateMsg?.visibility = View.VISIBLE
         mBinding?.rlEffects?.visibility = View.VISIBLE
 
-        if (SpUtil.getOpenEffect()==1){
+        if (SpUtil.getOpenEffect() == 1) {
             mBinding?.ivIcon?.setImageResource(com.xscm.moduleutil.R.mipmap.icon_close_effects)
-        }else{
+        } else {
             mBinding?.ivIcon?.setImageResource(com.xscm.moduleutil.R.mipmap.icon_open_effects)
         }