This commit is contained in:
2025-11-28 19:04:18 +08:00
parent 847c768e4d
commit 94a55bafea
19 changed files with 782 additions and 103 deletions

View File

@@ -53,7 +53,7 @@ public class RoomMessageEvent extends BaseEvent {
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,11 +67,11 @@ public class RoomMessageEvent extends BaseEvent {
private String victory_cover;//胜利的头像
private String defeated_name;//输掉的名称
private String defeated_cover;//输掉的头像
private String end_time;//惩罚时间 /// 在交友房中,是倒计时时间
private String end_time;//惩罚时间 /// 在交友房中,是倒计时时间 //签约房倒计时
private int is_mute;//1静音对方 0不静音对方
private int is_mute_pit;
private int count;//排麦模式下的人数
private int step ; //1:等待邂逅 2心动连线 3牵手良缘
private int step; //1:等待邂逅 2心动连线 3牵手良缘
private int friend_id; //场次id
// private List<FriendInfo.HeartList> list;//交友心动值发生变化
private List<UserInfo> list;//交友房麦位发生变化 //推送的事麦上用户信息这里使用了userinfo接收的
@@ -106,6 +106,10 @@ public class RoomMessageEvent extends BaseEvent {
private String rights_icon;//Cp特效
private String sign_id = "-1";//签约ID
private String sign_value;//签约最高价
private String sign_day;//被签约天数
private String current_body_value;//被签约身价
}

View File

@@ -86,6 +86,9 @@ public class UserInfo extends BaseEvent implements Serializable {
private CpInfo cp_info;
private int market_value;//身价
private String sign_value;
private String sign_id;
/*"cp_info": {
"name": "string",
"user_id1": "string",

View File

@@ -72,28 +72,27 @@ public class EMMessageInfo implements MultiItemEntity {
public static final int QXRoomMessageTypeRoomPKEnd = 1032;
/// pk断开
public static final int QXRoomMessageTypeRoomPKDisconnect = 1033;
///排麦模式下的人数变化
/// 排麦模式下的人数变化
public static final int QXRoomMessageTypeRoomMaiwrens = 1034;
public static final int QXRoomMessageTypeRoomDress = 1035;//动态修改用户头像信息
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;
public static final int QXRoomMessageTypeCPDx = 130;//心动礼物,单向发送
public static final int QXRoomMessageTypeCPSx = 131;//心动礼物,双向发送
/// 交友房阶段发生变化
public static final int QXRoomMessageTypeRoomFriendPartDidChanged = 1049;
/// 交友房时间发生延时
@@ -108,32 +107,46 @@ 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;
///在离线
/// 在离线
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 QXRoomMessageTypeSingerRoomCurrentSongDidChanged=1070;
/// 点歌房当前歌曲发生变化
public static final int QXRoomMessageTypeSingerRoomCurrentSongDidChanged = 1070;
///点歌房下一首歌曲发生变化
public static final int QXRoomMessageTypeSingerRoomNextSongDidChanged=1071;
/// 点歌房下一首歌曲发生变化
public static final int QXRoomMessageTypeSingerRoomNextSongDidChanged = 1071;
//已点歌曲数量
public static final int QXRoomMessageTypeSongerNum = 1072;
///房间内换麦
/// 房间内换麦
public static final int QXRoomMessageTypehm = 1039;
public static final int QXRoomMessageTypeCPText = 1080;//CP特效进入房间的特效
/// 签约开始
public static final int QXRoomMessageTypeSignStartText = 1090;
/// 签约出价 FromUserInfo 出价最高用户信息sign_value出的价sign_id场次
public static final int QXRoomMessageTypeSignMaxUserText = 1091;
/**
* 签约结束
* FromUserInfo出价用户信息
* ToUserInfo被签用户信息
* sign_value出的最高价
*/
public static final int QXRoomMessageTypeSignEndText = 1092;
/// 延时到这个时间点
public static final int QXRoomMessageTypeSignDelayText = 1093;
private RoomMessageEvent emMessage;