diff --git a/app/src/module_super_admin/java/com/tongdaxing/erban/sadmin/utils/SaAttachmentToMsgUtil.java b/app/src/module_super_admin/java/com/tongdaxing/erban/sadmin/utils/SaAttachmentToMsgUtil.java index f9392a8a1..ac25b099e 100644 --- a/app/src/module_super_admin/java/com/tongdaxing/erban/sadmin/utils/SaAttachmentToMsgUtil.java +++ b/app/src/module_super_admin/java/com/tongdaxing/erban/sadmin/utils/SaAttachmentToMsgUtil.java @@ -6,6 +6,7 @@ import android.widget.TextView; import com.yizhuan.erban.avroom.widget.MessageView; import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; import com.yizhuan.xchat_android_core.super_admin.attachment.SuperAdminOpAttachment; import com.yizhuan.xchat_android_core.super_admin.bean.SaOpInfo; @@ -27,7 +28,7 @@ public class SaAttachmentToMsgUtil { } String opName = null; MessageView.SpannableBuilder text = new MessageView.SpannableBuilder(tvContent); - text.append(" 系统检测涉嫌违规,", new ForegroundColorSpan(greyColor)); + text.append(AvRoomDataManager.get().isSuperAdmin(info.getHandleUid()) ? "" : " 系统检测涉嫌违规,", new ForegroundColorSpan(greyColor)); switch (opAttachment.getSecond()) { case CustomAttachment.CUSTOM_MSG_SUB_TYPE_SUPER_ADMIN_KICK_DOWN_MIC: if (!TextUtils.isEmpty(info.getTargetNick())) { diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/bean/KickOutExtBean.java b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/bean/KickOutExtBean.java index 5b1ec2504..45266397f 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/bean/KickOutExtBean.java +++ b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/bean/KickOutExtBean.java @@ -12,6 +12,7 @@ public class KickOutExtBean { public final static String KEY_ROLE = "role"; + public final static String KEY_UID = "handleUid"; /** * 操作者/超管 Uid diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SAdminOptUtil.java b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SAdminOptUtil.java index d0d03b81c..130a8ab56 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SAdminOptUtil.java +++ b/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SAdminOptUtil.java @@ -7,7 +7,6 @@ import com.yizhuan.xchat_android_core.kick.KickModel; import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.statistic.StatLogKey; import com.yizhuan.xchat_android_core.super_admin.bean.KickOutExtBean; import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; import com.yizhuan.xchat_android_library.utils.JavaUtil; @@ -24,6 +23,7 @@ public class SAdminOptUtil { /** * 判断该操作,是不是超管发起的 + * * @param reason - * @return - */ @@ -32,10 +32,18 @@ public class SAdminOptUtil { return false; } Map map = reason.getExtension(); + + if (map.containsKey(KickOutExtBean.KEY_UID)) { + Object handleUid = map.get(KickOutExtBean.KEY_UID); + if (handleUid instanceof String && AvRoomDataManager.get().isSuperAdmin((String) handleUid)) { + return false; + } + } + if (map.containsKey(KickOutExtBean.KEY_ROLE)) { Object role = map.get(KickOutExtBean.KEY_ROLE); if (role instanceof Integer) { - return 1 == (Integer)role; + return 1 == (Integer) role; } } return false; @@ -56,13 +64,13 @@ public class SAdminOptUtil { Single single; if (!AvRoomDataManager.get().isRoomAdmin()) { //将超管设置为房间管理员 - single = AvRoomModel.get().markManager(AuthModel.get().getCurrentUid(),true); + single = AvRoomModel.get().markManager(AuthModel.get().getCurrentUid(), true); } else { single = Single.just(""); } long roomId = AvRoomDataManager.get().getRoomId(); single.flatMap(s -> IMNetEaseManager.get().kickMemberFromRoomBySdk(roomId, - JavaUtil.str2long(kickUid), reason)) + JavaUtil.str2long(kickUid), reason)) //发公屏 .flatMap(s -> { ChatRoomMessage chatRoomMessage = SaAttachmentFactory