From 6ed5db59712798f62f863f2d9984af028d412fdd Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Thu, 1 Sep 2022 17:25:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AA=E6=9C=89=E6=88=BF=E4=B8=BB,=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98,=E8=B6=85=E7=AE=A1=E6=89=8D=E8=83=BD?=
 =?UTF-8?q?=E7=9C=8B=E5=88=B0=E6=8B=89=E9=BB=91=E5=92=8C=E8=B8=A2=E4=BA=BA?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xchat_android_core/manager/IMNetEaseManager.java     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java
index 4d21ecafe..641275b89 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java
+++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java
@@ -161,6 +161,7 @@ import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
 import com.yizhuan.xchat_android_core.super_admin.SuperAdminDataMrg;
 import com.yizhuan.xchat_android_core.super_admin.attachment.SuperAdminOpAttachment;
 import com.yizhuan.xchat_android_core.super_admin.bean.SaOpInfo;
+import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
 import com.yizhuan.xchat_android_core.team.bean.TeamInfo;
 import com.yizhuan.xchat_android_core.user.UserModel;
 import com.yizhuan.xchat_android_core.user.bean.BaseInfo;
@@ -671,7 +672,6 @@ public final class IMNetEaseManager {
                         || customAttachment.getFirst() == CustomAttachment.CUSTOM_MSG_HEADER_TYPE_FOLLOW_ROOM
                         || customAttachment.getFirst() == CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SEND_MAGIC
                         || customAttachment.getFirst() == CustomAttachment.CUSTOM_MSG_HEADER_TYPE_MULTI_GIFT
-                        || customAttachment.getFirst() == CustomAttachment.CUSTOM_MSG_HEADER_TYPE_KICK_MIC
                         || customAttachment.getFirst() == CustomAttachment.CUSTOM_MESS_TAROT
                         || customAttachment.getFirst() == CustomAttachment.CUSTOM_MSG_HEADER_TYPE_MONSTER_HUNTING
                         || customAttachment.getFirst() == CustomAttachment.CUSTOM_MSG_MINI_WORLD) {
@@ -881,7 +881,6 @@ public final class IMNetEaseManager {
                         break;
                     case CUSTOM_MSG_HEADER_TYPE_KICK_MIC:
                         // 如果本地没有的话，尝试获取服务器最新列表
-                        // MagicModel.get().getLocalMagicList().subscribe();
                         if (second == CUSTOM_MSG_SUB_TYPE_SEND_KICK_ROOM) {
                             RoomQueueMsgAttachment magicAttachment = (RoomQueueMsgAttachment) attachment;
                             noticeReceivedKickRoom(magicAttachment);
@@ -889,6 +888,12 @@ public final class IMNetEaseManager {
                             RoomQueueMsgAttachment magicAttachment = (RoomQueueMsgAttachment) attachment;
                             noticeReceivedAddBlack(magicAttachment);
                         }
+                        if (AvRoomDataManager.get().isRoomOwner() ||
+                                AvRoomDataManager.get().isRoomAdmin() ||
+                                AvRoomDataManager.get().isSuperAdmin() ||
+                                SuperAdminUtil.isSuperAdmin()) {
+                            addMessages(msg);
+                        }
                         break;
                     case CUSTOM_MSG_HEADER_TYPE_MONSTER_HUNTING:
                         switch (second) {