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 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; }