跨房PK:增加强制结束弹窗

core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java

@@ -1339,7 +1339,10 @@ public final class IMNetEaseManager {
                         RoomPKAttachment roomPKAttachment = (RoomPKAttachment) msg.getAttachment();
                         switch (second){
                             case CUSTOM_MSG_SUB_ROOM_PK_INVITE:
-                                noticeRoomEvent(msg, RoomEvent.ROOM_PK_INVITE);
+                                if ((AvRoomDataManager.get().isManager() || AvRoomDataManager.get().isSuperAdmin()) &&
+                                        !AvRoomDataManager.get().isOpenAnotherPKMode()){
+                                    noticeRoomEvent(msg, RoomEvent.ROOM_PK_INVITE);
+                                }
                                 break;
                             case CUSTOM_MSG_SUB_ROOM_PK_ACCEPT:
                                 noticeRoomEvent(msg, RoomEvent.ROOM_PK_ACCEPT);

core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomPkBean.java

@@ -41,6 +41,7 @@ public class RoomPkBean implements Serializable {
      * 倒计时开始时间点：时间戳
      */
     private long endTime;
+
     /**
      * 胜利方房主uid
      */