修改拍卖房结构，目前修改到拍卖者上麦下麦

moduleUtil/src/main/java/com/xscm/moduleutil/bean/GiftBean.java

@@ -21,6 +21,6 @@ public class GiftBean {
     private int number;
     private String createtime;
     private String nickname;
-    private String count;
+    private int count;
     private String user_id;
 }

moduleUtil/src/main/java/com/xscm/moduleutil/bean/RoomMessageEvent.java

@@ -1,5 +1,6 @@
 package com.xscm.moduleutil.bean;
 
+import com.xscm.moduleutil.bean.blindboxwheel.BlindBoxBean;
 import com.xscm.moduleutil.bean.room.FriendInfo;
 import com.xscm.moduleutil.bean.room.FriendUserBean;
 import com.xscm.moduleutil.bean.room.RoomAuction;
@@ -86,6 +87,8 @@ public class RoomMessageEvent {
         private long time_day;
 
         private int online_number;//在线人数
+
+        private BlindBoxBean.XlhData xlh_Data;
     }
 
     @Data

moduleUtil/src/main/java/com/xscm/moduleutil/bean/blindboxwheel/BlindBoxBean.java

@@ -30,7 +30,7 @@ public class BlindBoxBean {
     }
 
     public boolean isXlhDataObject() {
-        return xlh_data instanceof JsonObject || xlh_data instanceof XlhData;
+        return xlh_data instanceof JsonObject || xlh_data instanceof Map || xlh_data instanceof XlhData;
     }
 
     public List<XlhData> getXlhDataAsList() {
@@ -43,7 +43,77 @@ public class BlindBoxBean {
 
     public XlhData getXlhDataAsObject() {
         if (isXlhDataObject()) {
-            return (XlhData) xlh_data;
+            // 如果已经是XlhData类型，直接返回
+            if (xlh_data instanceof XlhData) {
+                return (XlhData) xlh_data;
+            }
+            // 如果是Map类型（Gson解析后的LinkedTreeMap），手动转换
+            else if (xlh_data instanceof Map) {
+                Map<String, Object> map = (Map<String, Object>) xlh_data;
+                XlhData xlhData = new XlhData();
+
+                // 安全地转换各个字段
+                Object waitingStartNum = map.get("waiting_start_num");
+                if (waitingStartNum != null) {
+                    xlhData.setWaiting_start_num(waitingStartNum.toString());
+                }
+
+                Object startNum = map.get("start_num");
+                if (startNum != null) {
+                    xlhData.setStart_num(startNum.toString());
+                }
+
+                Object currentNum = map.get("current_num");
+                if (currentNum != null) {
+                    if (currentNum instanceof Number) {
+                        xlhData.setCurrent_num(((Number) currentNum).intValue());
+                    } else {
+                        try {
+                            xlhData.setCurrent_num(Integer.parseInt(currentNum.toString()));
+                        } catch (NumberFormatException e) {
+                            xlhData.setCurrent_num(0);
+                        }
+                    }
+                }
+
+                Object status = map.get("status");
+                if (status != null) {
+                    if (status instanceof Number) {
+                        xlhData.setStatus(((Number) status).intValue());
+                    } else {
+                        try {
+                            xlhData.setStatus(Integer.parseInt(status.toString()));
+                        } catch (NumberFormatException e) {
+                            xlhData.setStatus(0);
+                        }
+                    }
+                }
+
+                return xlhData;
+            }
+            // 如果是JsonObject，也需要转换
+            else if (xlh_data instanceof JsonObject) {
+                JsonObject jsonObject = (JsonObject) xlh_data;
+                XlhData xlhData = new XlhData();
+
+                if (jsonObject.has("waiting_start_num")) {
+                    xlhData.setWaiting_start_num(jsonObject.get("waiting_start_num").getAsString());
+                }
+
+                if (jsonObject.has("start_num")) {
+                    xlhData.setStart_num(jsonObject.get("start_num").getAsString());
+                }
+
+                if (jsonObject.has("current_num")) {
+                    xlhData.setCurrent_num(jsonObject.get("current_num").getAsInt());
+                }
+
+                if (jsonObject.has("status")) {
+                    xlhData.setStatus(jsonObject.get("status").getAsInt());
+                }
+
+                return xlhData;
+            }
         }
         return null;
     }

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

@@ -96,6 +96,10 @@ public class EMMessageInfo implements MultiItemEntity {
     public static final int QXRoomMessageTypeHeartDidChanged = 1054;
     /// 小黑屋有人退出房间
     public static final int QXRoomMessageTypeHeartDid = 1055;
+    ///盲盒抽奖进度条
+    public static final int QXRoomMessageTypeMangH = 1056;
+    ///巡乐会
+    public static final int QXRoomMessageTypeXlh = 1057;
     private RoomMessageEvent emMessage;
 
     private int custom = 0;