From 19a00071b503e980264edf21919d2448877345e3 Mon Sep 17 00:00:00 2001 From: huangjian Date: Fri, 19 Nov 2021 17:17:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=A8=E6=88=BFPK:=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E6=88=BF=E9=97=B4=E7=AE=A1=E7=90=86=E7=9A=84=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E5=92=8C=E6=8E=A5=E5=8F=97=E8=B7=A8=E6=88=BFPK=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java | 2 +- .../yizhuan/xchat_android_core/manager/IMNetEaseManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java index eaddb6f17..d955aabf8 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/dialog/RoomOperationDialog.java @@ -163,7 +163,7 @@ public class RoomOperationDialog extends BottomSheetDialog { if (roomInfo == null || roomInfo.getIsPermitRoom() != 1) { return; } - if ((AvRoomDataManager.get().isManager() || AvRoomDataManager.get().isSuperAdmin()) && + if ((AvRoomDataManager.get().isRoomOwner() || AvRoomDataManager.get().isSuperAdmin()) && !AvRoomDataManager.get().isCpRoom()) { String str = AvRoomDataManager.get().isOpenAnotherPKMode() ? "跨房PK中" : "跨房PK"; int icon = AvRoomDataManager.get().isOpenAnotherPKMode() ? 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 e25fc58c9..f3a843c14 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 @@ -1342,7 +1342,7 @@ public final class IMNetEaseManager { } switch (second) { case CUSTOM_MSG_SUB_ROOM_PK_INVITE: - if ((AvRoomDataManager.get().isManager() || AvRoomDataManager.get().isSuperAdmin()) && + if ((AvRoomDataManager.get().isRoomOwner() || AvRoomDataManager.get().isSuperAdmin()) && !AvRoomDataManager.get().isOpenAnotherPKMode()) { noticeRoomEvent(msg, RoomEvent.ROOM_PK_INVITE); }