moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

跨房PK:PK结果弹窗

Browse Source
This commit is contained in:
huangjian
2021-11-11 19:01:55 +08:00
parent 5c99b5bf6b
commit 2e49955e7d
44 changed files with 639 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,6 @@ import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.bean.RoomMicInfo;
import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;
import com.yizhuan.xchat_android_core.bean.attachmsg.RoomQueueMsgAttachment;
import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo;
import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo;
import com.yizhuan.xchat_android_core.exception.ErrorThrowable;
@@ -101,7 +100,6 @@ import com.yizhuan.xchat_android_core.magic.bean.MagicInfo;
import com.yizhuan.xchat_android_core.magic.toolbox.MagicToolbox;
import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldDetailInfo;
import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldDetailInfoWithCurrentMember;
import com.yizhuan.xchat_android_core.miniworld.event.AudioPartyOpenEvent;
import com.yizhuan.xchat_android_core.miniworld.event.MiniWorldJoinVerifiedEvent;
import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo;
import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterProtocol;
@@ -273,8 +271,9 @@ import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUS
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ROOM_DIAMOND;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ROOM_MSG;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_ROOM_PK_ACCEPT;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_ROOM_PK_FINISH;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_ROOM_PK_INVITE;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_ROOM_PK_UPDATA;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_ROOM_PK_UPDATE;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_MONSTER_HUNTING;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_ADD_BLACK;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_KICK_ROOM;
@@ -1346,9 +1345,13 @@ public final class IMNetEaseManager {
noticeRoomEvent(msg, RoomEvent.ROOM_PK_ACCEPT);
AvRoomDataManager.get().roomPkLiveData.postValue(roomPKAttachment.getRoomPkBean());
break;
case CUSTOM_MSG_SUB_ROOM_PK_UPDATA:
case CUSTOM_MSG_SUB_ROOM_PK_UPDATE:
AvRoomDataManager.get().roomPkLiveData.postValue(roomPKAttachment.getRoomPkBean());
break;
case CUSTOM_MSG_SUB_ROOM_PK_FINISH:
noticeRoomEvent(msg, RoomEvent.ROOM_PK_FINISH);
AvRoomDataManager.get().roomPkLiveData.postValue(null);
break;
}
break;

6
core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CustomAttachment.java
View File

@@ -397,7 +397,11 @@ public class CustomAttachment implements MsgAttachment {
public static final int CUSTOM_MSG_ROOM_PK = 83;
public static final int CUSTOM_MSG_SUB_ROOM_PK_INVITE = 831;
public static final int CUSTOM_MSG_SUB_ROOM_PK_ACCEPT = 832;
public static final int CUSTOM_MSG_SUB_ROOM_PK_UPDATA = 834;
public static final int CUSTOM_MSG_SUB_ROOM_PK_REFUSE = 833;
public static final int CUSTOM_MSG_SUB_ROOM_PK_UPDATE = 834;
public static final int CUSTOM_MSG_SUB_ROOM_PK_FINISH = 835;
public static final int CUSTOM_MSG_SUB_ROOM_PK_NOTIFY = 836;
public CustomAttachment() {

2
core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java
View File

@@ -296,6 +296,7 @@ public final class AvRoomDataManager {
mRoomManagerList.clear();
mRoomLimitMemberList.clear();
mRoomNormalMemberList.clear();
roomSuperAdminList.clear();
}
public void clear() {
@@ -319,6 +320,7 @@ public final class AvRoomDataManager {
myIsInQueue = false;
roomNoDestory = false;
SuperAdminDataMrg.get().clearData();
roomPkLiveData.setValue(null);
}
public boolean isCpRoom() {

2
core/src/main/java/com/yizhuan/xchat_android_core/manager/RoomEvent.java
View File

@@ -212,7 +212,7 @@ public class RoomEvent {
public static final int ROOM_PK_INVITE = 72;
public static final int ROOM_PK_ACCEPT = 73;
public static final int ROOM_PK_FINISH = 74;
private int event = NONE;
private int micPosition = Integer.MIN_VALUE;

5
core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/ShowGiftDialogEvent.java Normal file
View File

@@ -0,0 +1,5 @@
package com.yizhuan.xchat_android_core.room.anotherroompk;
public class ShowGiftDialogEvent {
}

10
core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/ShowUserInfoDialogEvent.java Normal file
View File

@@ -0,0 +1,10 @@
package com.yizhuan.xchat_android_core.room.anotherroompk;
import lombok.AllArgsConstructor;
import lombok.Data;
@Data
@AllArgsConstructor
public class ShowUserInfoDialogEvent {
private String uid;
}