房间内部优化。

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

@@ -46,7 +46,7 @@ public class EMMessageInfo implements MultiItemEntity {
     public static final int QXRoomMessageTypeRoomIsClose = 1019;
     /// 修改房间信息
     public static final int QXRoomMessageTypeRoomUpdate = 1020;
-    /// 清楚魅力值
+    /// 清除魅力值
     public static final int QXRoomMessageTypeRoom = 1021;
     /// 拍卖者被拉上麦
     public static final int QXRoomMessageTypeAuctionIsUp = 1022;
@@ -78,8 +78,16 @@ public class EMMessageInfo implements MultiItemEntity {
     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;
 
     /// 交友房阶段发生变化
@@ -104,12 +112,16 @@ public class EMMessageInfo implements MultiItemEntity {
     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 QXRoomMessageTypehm = 1039;
+
+
+
     private RoomMessageEvent emMessage;
 
     private int custom = 0;

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

@@ -11,12 +11,12 @@ import lombok.Data;
 @Data
 public class PkRoomInfo  implements Serializable {
     private String pk_room_id;//对方房间的roomId
-    private String invite_pk_user_id;//pk发起者的用户id
+    private int invite_pk_user_id = -1;//pk发起者的用户id
     private String pk_id;//pkid
     private String pk_time;//剩余时间点
     private String my_room_value;//自己房间的pk值
     private String pk_room_value;//对方房间的pk值
     private String pk_part;;//2：等待开始、3：进行中、4：惩罚阶段
     private String pk_end_times;
-    private String receive_pk_user_id;//接受pk的用户id
+    private int receive_pk_user_id = -2;//接受pk的用户id
 }

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 = "-1";//麦位号
     private String state;//麦位状态 正常 ，1封麦；3禁麦
     private int is_lock;//0未锁麦 1锁麦
     private int is_mute;//0未禁麦 1禁麦

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

@@ -21,7 +21,7 @@ public class RoomUserBean implements Serializable {
      * shutup : 0
      */
 
-    private String user_id;//用户id
+    private int user_id;//用户id
     private String user_code;//用户id码
     private String sex;//性别1男2女
     private String nickname;//用户昵称

BaseModule/src/main/java/com/xscm/moduleutil/rtc/AgoraManagerEx.java

@@ -299,7 +299,7 @@ public class AgoraManagerEx {
             }
         };
     }
-    public void joinChannelEx(String token, String channelId, String pkUserIds) {
+    public void joinChannelEx(String token, String channelId, int pkUserIds) {
         if (rtcEngineEx != null) {
             options = new ChannelMediaOptions();
             options.clientRoleType = Constants.CLIENT_ROLE_BROADCASTER;
@@ -311,7 +311,7 @@ public class AgoraManagerEx {
             connection.channelId = channelId;
             connection.localUid = SpUtil.getUserId();
             pkRoomId = channelId;
-            pkUserId = Integer.parseInt(pkUserIds);
+            pkUserId = pkUserIds;
             rtcEngineEx.joinChannelEx(token, connection, options, getDefaultEventHandler());
             muteAllRemoteAudioStreamsEx(true);
             muteAllRemoteAudioStreamsExUserId(false);

BaseModule/src/main/java/com/xscm/moduleutil/utils/CrashHandler.java

@@ -4,6 +4,7 @@ import android.content.Context;
 import android.util.Log;
 
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.xscm.moduleutil.base.CommonAppContext;
 
 public class CrashHandler implements Thread.UncaughtExceptionHandler {
     private static CrashHandler instance;
@@ -37,5 +38,6 @@ public class CrashHandler implements Thread.UncaughtExceptionHandler {
     private void restartApp() {
         // 实现应用重启逻辑
         ARouter.getInstance().build(ARouteConstants.ME).navigation();
+        CommonAppContext.getInstance().initialization();
     }
 }

BaseModule/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java

@@ -162,7 +162,6 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
         this.pitBean = bean;
         this.roomId = bean.getRoom_id();
         countDownTime(bean.getCount_down());
-
         setCardiac(pitBean.getCharm(), getTzbl());
 
         if (bean.getUser_id() != null && !bean.getUser_id().equals("0") && !bean.getUser_id().isEmpty()) {

BaseModule/src/main/java/com/xscm/moduleutil/widget/GiftAnimView.java

@@ -145,8 +145,6 @@ public class GiftAnimView extends FrameLayout implements GiftSvgaView.OnAnimatio
                 if (stringList == null || stringList.isEmpty()) {
                     return;
                 }
-
-
                 /// 锁住list
                 lock.lock();
                 try {

BaseModule/src/main/java/com/xscm/moduleutil/widget/RoomSingSongWheatView.java

@@ -76,7 +76,7 @@ public class RoomSingSongWheatView extends BaseWheatView {
     }
 
     private void handleOnState(RoomPitBean bean) {
-        mIvRipple.setVisibility(VISIBLE);
+//        mIvRipple.setVisibility(VISIBLE);
         mTvName.setText(bean.getNickname());
         ImageUtils.loadHeadCC(bean.getAvatar(), mRiv);
         mCharmView.setVisibility(VISIBLE);

BaseModule/src/main/res/values/styles.xml

@@ -108,6 +108,12 @@
         <attr name="matProg_linearProgress" format="boolean" />
     </declare-styleable>
 
+    <style name="dialogBottom" parent="@style/AppTheme">
+        <item name="android:windowEnterAnimation">@anim/dialog_enter</item>
+        <item name="android:windowExitAnimation">@anim/dialog_exit</item>
+        <item name="android:windowBackground">@android:color/transparent</item> <!-- 透明背景 -->
+        <item name="android:windowIsFloating">true</item> <!-- 确保是对话框样式 -->
+    </style>
     <style name="CommonShowDialogBottom" parent="android:Animation">
         <!--//进入时的动画-->
         <item name="android:windowEnterAnimation">@anim/dialog_enter</item>