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) {