1:羽声新版本

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

@@ -1,9 +1,7 @@
 package com.xscm.moduleutil.bean;
 
-import com.xscm.moduleutil.bean.room.FriendInfo;
-import com.xscm.moduleutil.bean.room.RoomAuction;
-import com.xscm.moduleutil.bean.room.RoomBean;
-import com.xscm.moduleutil.bean.room.RoomPitBean;
+import com.xscm.moduleutil.bean.blindboxwheel.BlindBoxBean;
+import com.xscm.moduleutil.bean.room.*;
 
 import java.util.List;
 
@@ -15,6 +13,9 @@ public class RoomMessageEvent {
     private String RoomId; // 房间 ID
     private T Text; // 携带的数据对象
 
+    public RoomMessageEvent() {
+    }
+
     public RoomMessageEvent(int msgType, String roomId, T text) {
         MsgType = msgType;
         RoomId = roomId;
@@ -30,7 +31,9 @@ public class RoomMessageEvent {
         private String jia_jia;
         private UserInfo FromUserInfo;
         private UserInfo ToUserInfo;
+        private List<UserInfo> ToUserInfos;
         private GiftBean GiftInfo;
+        private List<GiftBean> GiftInfos;
         private int room_up_pit_type;
         private MusicSongBean songInfo;
         private MusicSongBean nextInfo;
@@ -47,7 +50,7 @@ public class RoomMessageEvent {
         private String AcceptRoomId;//接收者所在的房间id
         private String PkId;
         private String room_id;//当type==1的时候。这个roomId是对方的房间id
-        private String user_id;
+        private String user_id="";
         private String pk_end_times;//pk结束时间
         private List<RoomPitBean> userCharmList;
 
@@ -67,10 +70,32 @@ public class RoomMessageEvent {
         private int count;//排麦模式下的人数
         private int step ; //1:等待邂逅 2：心动连线 3：牵手良缘
         private int friend_id; //场次id
-        private List<FriendInfo.HeartList> heart_list;//交友心动值发生变化
+//        private List<FriendInfo.HeartList> list;//交友心动值发生变化
         private List<UserInfo> list;//交友房麦位发生变化 //推送的事麦上用户信息，这里使用了userinfo接收的
 
+        private FriendUserBean friend_user;//这是推送过来需要卡关系的数据
+
+        private String relation_name;
+        private String user1_id;
+        private String user2_id;
+        private String user1_avatar;
+        private String user1_nickname;
+        private String user2_nickname;
+        private String user2_avatar;
+        private long time_day;
+
         private int online_number;//在线人数
+
+        private BlindBoxBean.XlhData xlh_data;
+        private String from_pit_number;
+        private String to_pit_number;
+
+        private String gift_num;
+
+        private RedPacketInfo redpacketInfo;
+        private String redpacket_id;
+
+        private EmotionDeatils emoji;
     }
 
     @Data