yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

只有房主,管理员,超管才能看到拉黑和踢人消息

Browse Source
This commit is contained in:
huangjian
2022-09-01 17:25:13 +08:00
parent d92b41a1a3
commit 6ed5db5971
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java
View File

@@ -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.SuperAdminDataMrg;
import com.yizhuan.xchat_android_core.super_admin.attachment.SuperAdminOpAttachment; 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.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.team.bean.TeamInfo;
import com.yizhuan.xchat_android_core.user.UserModel; import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.BaseInfo; 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_FOLLOW_ROOM
|| customAttachment.getFirst() == CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SEND_MAGIC || 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_MULTI_GIFT
|| customAttachment.getFirst() == CustomAttachment.CUSTOM_MSG_HEADER_TYPE_KICK_MIC
|| customAttachment.getFirst() == CustomAttachment.CUSTOM_MESS_TAROT || customAttachment.getFirst() == CustomAttachment.CUSTOM_MESS_TAROT
|| customAttachment.getFirst() == CustomAttachment.CUSTOM_MSG_HEADER_TYPE_MONSTER_HUNTING || customAttachment.getFirst() == CustomAttachment.CUSTOM_MSG_HEADER_TYPE_MONSTER_HUNTING
|| customAttachment.getFirst() == CustomAttachment.CUSTOM_MSG_MINI_WORLD) { || customAttachment.getFirst() == CustomAttachment.CUSTOM_MSG_MINI_WORLD) {
@@ -881,7 +881,6 @@ public final class IMNetEaseManager {
break; break;
case CUSTOM_MSG_HEADER_TYPE_KICK_MIC: case CUSTOM_MSG_HEADER_TYPE_KICK_MIC:
// 如果本地没有的话，尝试获取服务器最新列表 // 如果本地没有的话，尝试获取服务器最新列表
// MagicModel.get().getLocalMagicList().subscribe();
if (second == CUSTOM_MSG_SUB_TYPE_SEND_KICK_ROOM) { if (second == CUSTOM_MSG_SUB_TYPE_SEND_KICK_ROOM) {
RoomQueueMsgAttachment magicAttachment = (RoomQueueMsgAttachment) attachment; RoomQueueMsgAttachment magicAttachment = (RoomQueueMsgAttachment) attachment;
noticeReceivedKickRoom(magicAttachment); noticeReceivedKickRoom(magicAttachment);
@@ -889,6 +888,12 @@ public final class IMNetEaseManager {
RoomQueueMsgAttachment magicAttachment = (RoomQueueMsgAttachment) attachment; RoomQueueMsgAttachment magicAttachment = (RoomQueueMsgAttachment) attachment;
noticeReceivedAddBlack(magicAttachment); noticeReceivedAddBlack(magicAttachment);
} }
if (AvRoomDataManager.get().isRoomOwner() ||
AvRoomDataManager.get().isRoomAdmin() ||
AvRoomDataManager.get().isSuperAdmin() ||
SuperAdminUtil.isSuperAdmin()) {
addMessages(msg);
}
break; break;
case CUSTOM_MSG_HEADER_TYPE_MONSTER_HUNTING: case CUSTOM_MSG_HEADER_TYPE_MONSTER_HUNTING:
switch (second) { switch (second) {