feat:完成房间团队PK-UI改版
This commit is contained in:
@@ -1116,6 +1116,7 @@ public final class IMNetEaseManager {
|
||||
Logger.e(ResUtil.getString(R.string.xchat_android_core_manager_imneteasemanager_020) + msg.getAttachment().toJson(false));
|
||||
//更新房間PK信息
|
||||
PkModel.get().onReceivePKCreate(((RoomPkAttachment) msg.getAttachment()).getRoomPkData());
|
||||
noticePKCreate();
|
||||
noticePKInfo();
|
||||
addMessages(msg);
|
||||
break;
|
||||
@@ -1138,6 +1139,7 @@ public final class IMNetEaseManager {
|
||||
break;
|
||||
case CUSTOM_MESS_SUB_ROOM_PK_RE_START:
|
||||
PkModel.get().onReceivePKCreate(((RoomPkAttachment) msg.getAttachment()).getRoomPkData());
|
||||
noticePKCreate();
|
||||
noticePKInfo();
|
||||
addMessages(msg);
|
||||
break;
|
||||
@@ -3581,6 +3583,10 @@ public final class IMNetEaseManager {
|
||||
getChatRoomEventObservable().onNext(new RoomEvent().setEvent(RoomEvent.PK_START));
|
||||
}
|
||||
|
||||
private void noticePKCreate() {
|
||||
getChatRoomEventObservable().onNext(new RoomEvent().setEvent(RoomEvent.PK_CREATE));
|
||||
}
|
||||
|
||||
/**
|
||||
* 記錄用戶一天進入的房間id,隔天重置
|
||||
*/
|
||||
|
@@ -138,7 +138,6 @@ public class RoomEvent {
|
||||
//PK开始
|
||||
public static final int PK_START = 52;
|
||||
|
||||
|
||||
/**
|
||||
* 收到普通多人礼物
|
||||
*/
|
||||
@@ -266,6 +265,9 @@ public class RoomEvent {
|
||||
|
||||
public static final int TEMPLATE_NOTIFY = 110;
|
||||
|
||||
//PK创建
|
||||
public static final int PK_CREATE = 111;
|
||||
|
||||
private int event = NONE;
|
||||
private int micPosition = Integer.MIN_VALUE;
|
||||
private int posState = -1;
|
||||
|
@@ -6,5 +6,17 @@ package com.chwl.core.room.pk.event;
|
||||
* @Date 2019/1/13
|
||||
*/
|
||||
public class PKDataUpdateEvent {
|
||||
public static int TYPE_RESULT = 1;
|
||||
int type = 0;
|
||||
|
||||
public PKDataUpdateEvent() {
|
||||
}
|
||||
|
||||
public PKDataUpdateEvent(int type) {
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
public int getType() {
|
||||
return type;
|
||||
}
|
||||
}
|
||||
|
@@ -992,7 +992,7 @@ public class PkModel extends BaseModel implements IPkModel {
|
||||
//更新PKData
|
||||
curPkInfo = roomPkData;
|
||||
curPkInfo.setCurPkTimeUntilEnd(0);
|
||||
EventBus.getDefault().post(new PKDataUpdateEvent());
|
||||
EventBus.getDefault().post(new PKDataUpdateEvent(PKDataUpdateEvent.TYPE_RESULT));
|
||||
|
||||
//清除计分
|
||||
mapHashMap.clear();
|
||||
|
Reference in New Issue
Block a user