点唱房功能

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

@@ -117,6 +117,15 @@ public class EMMessageInfo implements MultiItemEntity {
     ///移除红包
     public static final int QXRoomMessageTypeQXRoomMessageRedRemove = 1061;
 
+    ///点歌房当前歌曲发生变化
+    public static final int QXRoomMessageTypeSingerRoomCurrentSongDidChanged=1070;
+
+    ///点歌房下一首歌曲发生变化
+    public static final int QXRoomMessageTypeSingerRoomNextSongDidChanged=1071;
+
+    //已点歌曲数量
+    public static final int QXRoomMessageTypeSongerNum = 1072;
+
     ///房间内换麦
     public static final int QXRoomMessageTypehm = 1039;
 

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

@@ -6,6 +6,8 @@ import java.io.Serializable;
 import java.util.List;
 
 import com.xscm.moduleutil.bean.NobilitDeatils;
+import com.xscm.moduleutil.bean.SingerInfo;
+
 import lombok.Data;
 
 /**
@@ -34,6 +36,8 @@ public class RoomInfoResp implements Serializable {
     private int hour_ranking_open;//1:开启 0：关闭
     private NobilitDeatils.NobilityInfo nobility_info;
 
+    private SingerInfo singer_info;
+
 
     //弹出麦位操作弹出
     public boolean isWheatManager() {

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="";//麦位号
     private String state;//麦位状态 正常 ，1封麦；3禁麦
     private int is_lock;//0未锁麦 1锁麦
     private int is_mute;//0未禁麦 1禁麦
@@ -69,4 +69,8 @@ public class RoomPitBean implements Serializable {
     private String nickname_color;//昵称颜色
     private String mic_cycle;//麦圈
 
+
+    private boolean occupied;
+    private boolean imageType;//是否是演唱者
+
 }