房间内部优化。

BaseModule/src/main/java/com/xscm/moduleutil/bean/room/EMMessageInfo.java

@@ -46,7 +46,7 @@ public class EMMessageInfo implements MultiItemEntity {
     public static final int QXRoomMessageTypeRoomIsClose = 1019;
     /// 修改房间信息
     public static final int QXRoomMessageTypeRoomUpdate = 1020;
-    /// 清楚魅力值
+    /// 清除魅力值
     public static final int QXRoomMessageTypeRoom = 1021;
     /// 拍卖者被拉上麦
     public static final int QXRoomMessageTypeAuctionIsUp = 1022;
@@ -78,8 +78,16 @@ public class EMMessageInfo implements MultiItemEntity {
     public static final int QXRoomMessageTypeRoomOnline = 1036;//
     public static final int QXRoomMessageTypeRoomOPK = 1037;
     public static final int QXRoomMessageTypeRoomOMh = 1038;
+
+    ///清除当前消息列表
+    public static final int QXRoomMessageTypeClearMsg = 123;
+
+    ///播放音乐
+    public static final int QXRoomMessageTypeRoomMusicPlay = 124;
+
     ///关闭对方麦克风
     public static final int QXRoomMessageTypeMuteRemoteAudio = 125;
+    ///小黑屋 关麦
     public static final int QXRoomMessageTypeMuteLocalAudio = 126;
 
     /// 交友房阶段发生变化
@@ -104,12 +112,16 @@ public class EMMessageInfo implements MultiItemEntity {
     public static final int QXRoomMessageTypezailx = 1058;
     ///清除个人魅力值
     public static final int QXRoomMessageTypeQingGRMl = 1059;
-    //有红包列表
+    ///有红包列表
     public static final int QXRoomMessageTypeQXRoomMessageRed = 1060;
+    ///移除红包
     public static final int QXRoomMessageTypeQXRoomMessageRedRemove = 1061;
 
     ///房间内换麦
     public static final int QXRoomMessageTypehm = 1039;
+
+
+
     private RoomMessageEvent emMessage;
 
     private int custom = 0;

BaseModule/src/main/java/com/xscm/moduleutil/bean/room/PkRoomInfo.java

@@ -11,12 +11,12 @@ import lombok.Data;
 @Data
 public class PkRoomInfo  implements Serializable {
     private String pk_room_id;//对方房间的roomId
-    private String invite_pk_user_id;//pk发起者的用户id
+    private int invite_pk_user_id = -1;//pk发起者的用户id
     private String pk_id;//pkid
     private String pk_time;//剩余时间点
     private String my_room_value;//自己房间的pk值
     private String pk_room_value;//对方房间的pk值
     private String pk_part;;//2：等待开始、3：进行中、4：惩罚阶段
     private String pk_end_times;
-    private String receive_pk_user_id;//接受pk的用户id
+    private int receive_pk_user_id = -2;//接受pk的用户id
 }

BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomPitBean.java

@@ -29,7 +29,7 @@ public class RoomPitBean implements Serializable {
      */
 
     private String id;//id
-    private String pit_number;//麦位号
+    private String pit_number = "-1";//麦位号
     private String state;//麦位状态 正常 ，1封麦；3禁麦
     private int is_lock;//0未锁麦 1锁麦
     private int is_mute;//0未禁麦 1禁麦

BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomUserBean.java

@@ -21,7 +21,7 @@ public class RoomUserBean implements Serializable {
      * shutup : 0
      */
 
-    private String user_id;//用户id
+    private int user_id;//用户id
     private String user_code;//用户id码
     private String sex;//性别1男2女
     private String nickname;//用户昵称