合并1

BaseModule/src/main/java/com/xscm/moduleutil/bean/room/EmotionDeatils.kt

@@ -6,6 +6,7 @@ data class EmotionDeatils(
     var type_id: Int? = 0,
     var name: String? = "",
     var image: String? = "",
+    var is_lock: Int = 0,//0:未锁定 1:锁定
     var animate_image : String? = "",
     var children: List<Children>? =ArrayList (),
 )
@@ -17,4 +18,5 @@ data class Children(
     var name: String? = "",
     var image: String? = "",
     var animate_image : String? = "",
+    var is_lock: Int? = 0,//0:未锁定 1:锁定
 )

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

@@ -37,6 +37,9 @@ public class RoomAuction implements Serializable {
         private String base_image;//礼物图片
         private long duration;//时间
         private String charm;
+        private String nobility_image;//贵族图标
+        private String nickname_color;//昵称颜色
+        private String mic_cycle;//麦圈
     }
 
     @Data

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

@@ -5,6 +5,7 @@ import com.xscm.moduleutil.bean.MusicSongBean;
 import java.io.Serializable;
 import java.util.List;
 
+import com.xscm.moduleutil.bean.NobilitDeatils;
 import lombok.Data;
 
 /**
@@ -31,6 +32,7 @@ public class RoomInfoResp implements Serializable {
     private FriendInfo friend_info;
     private GiftXlh gift_cycle;
     private int hour_ranking_open;//1:开启 0：关闭
+    private NobilitDeatils.NobilityInfo nobility_info;
 
 
     //弹出麦位操作弹出

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 = "-1";//麦位号
+    private String pit_number;//麦位号
     private String state;//麦位状态 正常 ，1封麦；3禁麦
     private int is_lock;//0未锁麦 1锁麦
     private int is_mute;//0未禁麦 1禁麦
@@ -51,7 +51,7 @@ public class RoomPitBean implements Serializable {
     private String emchat_username;
     private String rank_id;
     private String nobility;
-//    private String xin_dong;
+    //    private String xin_dong;
     private String banned;
     private String dress_picture;
     private RankInfo rank_info;
@@ -65,4 +65,8 @@ public class RoomPitBean implements Serializable {
     private int heartId; //  "heartId": 4,
     private int heartNum; //          "heartNum": 10510
 
+    private String nobility_image;//贵族图标
+    private String nickname_color;//昵称颜色
+    private String mic_cycle;//麦圈
+
 }

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

@@ -39,6 +39,10 @@ public class RoomUserBean implements Serializable {
     private String is_mute;//是否在本房间禁言 1是 0否
     private String is_mute_pit;//是否在本房间内禁麦 1是 0否
 
+    private String nobility_image;//贵族图标
+    private String nickname_color;//昵称颜色
+    private String mic_cycle;//麦圈
+
 //    private int banned;
 //    private int favorite;
 //    private int pit;