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

新增跨房PK预约提示气泡

Browse Source
This commit is contained in:
huangjian
2022-07-14 17:41:40 +08:00
parent 84fa1c74e1
commit 6dd7481a29
10 changed files with 81 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1251,6 +1251,11 @@ public final class IMNetEaseManager {
case CUSTOM_MSG_SUB_SINGLE_ROOM_PK_NOTIFY:
noticeRoomEvent(msg, RoomEvent.SINGLE_ROOM_PK_NOTIFY);
break;
case CUSTOM_MSG_SUB_ROOM_PK_ORDER:
AvRoomDataManager.get().showPkBeginTime = true;
AvRoomDataManager.get().pkBeginTime = roomPkBean.getBeginTime();
noticeRoomEvent(msg, RoomEvent.ROOM_PK_ORDER);
break;
}
break;
case CUSTOM_MSG_VIP:

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

@@ -346,6 +346,7 @@ public class CustomAttachment implements MsgAttachment {
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 static final int CUSTOM_MSG_SUB_ROOM_PK_ORDER = 8314;
public static final int CUSTOM_MSG_SUB_SINGLE_ROOM_PK_INVITE = 837;// 个播pk发出邀请
public static final int CUSTOM_MSG_SUB_SINGLE_ROOM_PK_REFUSE = 838;// 个播pk拒绝邀请
public static final int CUSTOM_MSG_SUB_SINGLE_ROOM_PK_ACCEPT = 839;// 个播pk接受邀请

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

@@ -110,6 +110,11 @@ public class RoomPkBean implements Serializable {
private String winNick;
private String failNick;
/**
* PK预约字段
*/
private long beginTime;
@Data
public static class RankBean implements Serializable {
//uid

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

@@ -175,7 +175,8 @@ public final class AvRoomDataManager {
//清空公屏消息时间
public long clearScreenTime;
private Disposable subscribe;
public boolean showPkBeginTime;
public long pkBeginTime;
/**
* 一起玩 按钮开关
*/
@@ -325,9 +326,6 @@ public final class AvRoomDataManager {
if (mCurrentRoomInfo != null) {
mCurrentRoomInfo = null;
}
if (subscribe != null) {
subscribe.dispose();
}
haveSelfChange = false;
GiftValueMrg.get().clearObsever();
mMicQueueMemberMap.clear();

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

@@ -233,6 +233,8 @@ public class RoomEvent {
public static final int ROOM_RANK_TOP_NOTIFY = 91;
public static final int ROOM_PK_ORDER = 92;
private int event = NONE;
private int micPosition = Integer.MIN_VALUE;
private int posState = -1;

3
core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInfo.java
View File

@@ -141,6 +141,9 @@ public class RoomInfo implements Parcelable,Serializable {
private long worldId; // >0:语音派对房
private boolean showPkBeginTime;
private long pkBeginTime;
protected RoomInfo(Parcel in) {
uid = in.readLong();
officeUser = in.readInt();