From 840a1243aa475b16ae80724f794affe8c90f396d Mon Sep 17 00:00:00 2001
From: max <mxruan@163.com>
Date: Fri, 7 Jun 2024 20:03:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D1v1=E6=B8=B8=E6=88=8F?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95IM=E9=97=AE=E9=A2=98=20fix=EF=BC=9A=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=85=AC=E8=81=8A=E6=96=B0=E6=B6=88=E6=81=AF=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E5=99=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/chwl/app/game/core/GameIMEngineAbility.kt     | 3 +++
 .../java/com/chwl/app/public_chat/core/ChatRoomClient.kt   | 2 +-
 .../ui/message/PublicChatRoomMessageListPanel.java         | 6 +++---
 .../main/java/com/chwl/core/manager/IMNetEaseManager.java  | 7 +++++++
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/src/module_game/java/com/chwl/app/game/core/GameIMEngineAbility.kt b/app/src/module_game/java/com/chwl/app/game/core/GameIMEngineAbility.kt
index 98c71b959..6f9bff786 100644
--- a/app/src/module_game/java/com/chwl/app/game/core/GameIMEngineAbility.kt
+++ b/app/src/module_game/java/com/chwl/app/game/core/GameIMEngineAbility.kt
@@ -2,6 +2,7 @@ package com.chwl.app.game.core
 
 import com.chwl.app.public_chat.core.ChatRoomClient
 import com.chwl.app.public_chat.core.ChatRoomClientManager
+import com.chwl.core.manager.IMNetEaseManager
 import com.chwl.core.support.listener.ListenerOwner
 import com.chwl.core.support.listener.ListenerStore
 import com.chwl.core.support.listener.SafeListenerOwner
@@ -71,6 +72,7 @@ class GameIMEngineAbility(private val listenerOwner: ListenerOwner<GameIMEngineA
 
     private fun exitRoom() {
         logD("exitRoom() id:${chatRoomClient?.sessionId}")
+        IMNetEaseManager.gameChatRoomId = null
         chatRoomClient?.onCleared()
         chatRoomClient = null
     }
@@ -102,6 +104,7 @@ class GameIMEngineAbility(private val listenerOwner: ListenerOwner<GameIMEngineA
     }
 
     private fun enterChatRoom(client: ChatRoomClient) {
+        IMNetEaseManager.gameChatRoomId = client.sessionId
         addDisposable(client.enterChatRoom().subscribe({
         }, {
         }))
diff --git a/app/src/module_public_chat/java/com/chwl/app/public_chat/core/ChatRoomClient.kt b/app/src/module_public_chat/java/com/chwl/app/public_chat/core/ChatRoomClient.kt
index 162b3d138..ba1ce9041 100644
--- a/app/src/module_public_chat/java/com/chwl/app/public_chat/core/ChatRoomClient.kt
+++ b/app/src/module_public_chat/java/com/chwl/app/public_chat/core/ChatRoomClient.kt
@@ -141,7 +141,7 @@ open class ChatRoomClient(val sessionId: String) : ICleared, ILog {
     }
 
     fun exitChatRoom() {
-        logD("exitChatRoom()")
+        logD("exitChatRoom() sessionId:$sessionId")
         NIMChatRoomSDK.getChatRoomService().exitChatRoom(sessionId)
     }
 
diff --git a/app/src/module_public_chat/java/com/chwl/app/public_chat/ui/message/PublicChatRoomMessageListPanel.java b/app/src/module_public_chat/java/com/chwl/app/public_chat/ui/message/PublicChatRoomMessageListPanel.java
index ced1aa7a6..d6c042599 100644
--- a/app/src/module_public_chat/java/com/chwl/app/public_chat/ui/message/PublicChatRoomMessageListPanel.java
+++ b/app/src/module_public_chat/java/com/chwl/app/public_chat/ui/message/PublicChatRoomMessageListPanel.java
@@ -267,7 +267,7 @@ public class PublicChatRoomMessageListPanel {
         List<ChatRoomMessage> addedListItems = new ArrayList<>(messages.size());
         for (ChatRoomMessage message : messages) {
 
-            if (isMyMessage(message) && !filterMessage(message)) {
+            if (isMyMessage(message) && filterMessage(message)) {
                 items.add(message);
                 addedListItems.add(message);
                 needRefresh = true;
@@ -375,10 +375,10 @@ public class PublicChatRoomMessageListPanel {
         if (message.getMsgType() == MsgTypeEnum.custom && message.getAttachment() instanceof HeadlineChangedAttachment) {
             HeadlineBean data = ((HeadlineChangedAttachment) message.getAttachment()).getHeadlineData();
             if (data == null || !data.isValid()) {
-                return true;
+                return false;
             }
         }
-        return false;
+        return true;
     }
 
     /**
diff --git a/core/src/main/java/com/chwl/core/manager/IMNetEaseManager.java b/core/src/main/java/com/chwl/core/manager/IMNetEaseManager.java
index 93d5088d1..44ba45e7a 100644
--- a/core/src/main/java/com/chwl/core/manager/IMNetEaseManager.java
+++ b/core/src/main/java/com/chwl/core/manager/IMNetEaseManager.java
@@ -238,6 +238,10 @@ public final class IMNetEaseManager {
     // 用于网络重连的判断
     private boolean isNetBroken = false;
 
+    // 临时方案:解决1V1游戏房被filterAnotherChatRoomInternal误杀问题
+    @Deprecated()
+    public static String gameChatRoomId;
+
     private IMNetEaseManager() {
         roomProcessor = PublishProcessor.create();
         relationShipProcessor = PublishProcessor.create();
@@ -620,6 +624,9 @@ public final class IMNetEaseManager {
         if (Objects.equals(sessionId, String.valueOf(PublicChatHallDataManager.get().getPublicChatHallId()))) {
             return true;
         }
+        if (Objects.equals(sessionId, gameChatRoomId)) {
+            return true;
+        }
         if (Objects.equals(sessionId, InitialModel.get().getPublicChatSessionId())) {
             return true;
         }