Merge branch 'branch_new' into branch_new_83

2：修改礼盒记录标题显示

BaseModule/build.gradle

@@ -172,7 +172,9 @@ dependencies {
 //    api('com.tencent.liteav:LiteAVSDK_Professional:10.9.0.13102')
 //    api('com.google.android.exoplayer:exoplayer-core:2.19.1')
 //    api('com.google.android.exoplayer:exoplayer-ui:2.19.1')
-    api("com.egame.vap:animplayer:2.0.8")
+//    api("com.egame.vap:animplayer:2.0.8")
+    api project(":animplayer")
+
     api("com.liulishuo.okdownload:okdownload:1.0.7")
 
     api('com.zlc.glide:webpdecoder:1.6.4.9.0')

BaseModule/src/main/java/com/xscm/moduleutil/adapter/AppUpdateDialog.java

@@ -74,8 +74,7 @@ public class AppUpdateDialog extends BaseDialog<DialogAppUpdateBinding> implemen
             mProgressDialog.setCanceledOnTouchOutside(false);
             mProgressDialog.setMessage("下载中请稍等！！！");
             mProgressDialog.show();
-            DownloadUtil downloadUtil = new DownloadUtil(getContext());
+            DownloadUtil downloadUtil = new DownloadUtil(getContext(),appUpdateModel.getUrl(),this);
-            downloadUtil.downloadFile(appUpdateModel.getUrl(), this);
         }
     }
 

BaseModule/src/main/java/com/xscm/moduleutil/adapter/CirleListAdapter.java

@@ -274,9 +274,11 @@ public class CirleListAdapter extends BaseQuickAdapter<CircleListBean, BaseViewH
         }
 
         if (item.getRoom_id() != null && !item.getRoom_id().equals("0")) {
-            helper.setText(R.id.gensui, "跟随");
+            helper.setText(R.id.gensui, "");
+            helper.getView(R.id.gensui).setBackgroundResource(com.xscm.moduleutil.R.mipmap.gsui);
         } else if (item.getRoom_id() == null || item.getRoom_id().equals("0")) {
-            helper.setText(R.id.gensui, "私信");
+            helper.setText(R.id.gensui, "");
+            helper.getView(R.id.gensui).setBackgroundResource(com.xscm.moduleutil.R.mipmap.six);
         }
         //分享数
 //        helper.setText(R.id.dy_zs, item.getRewards_num() != null ? item.getRewards_num() : "0");

BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftPackAdapter.java

@@ -122,6 +122,7 @@ public class GiftPackAdapter extends BaseAdapter {
             viewHolder.ivDownOn = (ImageView) convertView.findViewById(R.id.iv_down_on);
             viewHolder.cl_iv_down_on = (ConstraintLayout) convertView.findViewById(R.id.cl_iv_down_on);
             viewHolder.integral = (TextView) convertView.findViewById(R.id.integral);
+            viewHolder.im_heart = (ImageView) convertView.findViewById(R.id.im_heartssss);
             convertView.setTag(viewHolder);
         } else {
             viewHolder = (GiftPackAdapter.ViewHolder) convertView.getTag();
@@ -168,5 +169,6 @@ public class GiftPackAdapter extends BaseAdapter {
         public TextView tv_gift_change_love_values;
         public ImageView ivDownOn;
         public ConstraintLayout cl_iv_down_on;
+        public ImageView im_heart;
     }
 }

BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftRoomAdapter.java

@@ -1,6 +1,7 @@
 package com.xscm.moduleutil.adapter;
 
 import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -79,6 +80,7 @@ public class GiftRoomAdapter extends BaseAdapter {
         private static RoonGiftModel sGiftModel;
         private GiftRoomAdapter mAdapter;
         private RoonGiftModel mGiftModel;
+
         public void setGiftModel(GiftRoomAdapter adapter, RoonGiftModel gift) {
             sAdapter = new WeakReference<>(adapter);
             sGiftModel = gift;
@@ -122,14 +124,16 @@ public class GiftRoomAdapter extends BaseAdapter {
         if (convertView == null) {
             convertView = inflater.inflate(R.layout.item_gift_room, parent, false);
             viewHolder = new ViewHolder();
+            viewHolder.item_layout = (ConstraintLayout) convertView.findViewById(R.id.cl_gift);
+            viewHolder.cl_iv_down_on = (ConstraintLayout) convertView.findViewById(R.id.cl_iv_down_on);
             viewHolder.tv_gift_name = (TextView) convertView.findViewById(R.id.tv_gift_name);
             viewHolder.tv_gift_price = (TextView) convertView.findViewById(R.id.tv_gift_price);
             viewHolder.iv_gift_pic = (ImageView) convertView.findViewById(R.id.iv_gift_pic);
-            viewHolder.item_layout = (ConstraintLayout) convertView.findViewById(R.id.cl_gift);
             viewHolder.ivDownOn = (ImageView) convertView.findViewById(R.id.iv_down_on);
-            viewHolder.cl_iv_down_on = (ConstraintLayout) convertView.findViewById(R.id.cl_iv_down_on);
+            viewHolder.iv_gift_select = (ImageView) convertView.findViewById(R.id.iv_gift_select);
-            viewHolder.iv_gift_select= (ImageView) convertView.findViewById(R.id.iv_gift_select);
 
+            // im_heart现在位于顶层布局中
+            viewHolder.im_heart = (ImageView) convertView.findViewById(R.id.im_heartssss);
             convertView.setTag(viewHolder);
         } else {
             viewHolder = (ViewHolder) convertView.getTag();
@@ -137,17 +141,32 @@ public class GiftRoomAdapter extends BaseAdapter {
 
         viewHolder.item_layout.setOnClickListener(v -> {
 //            RoonGiftModel clickedModel = (RoonGiftModel) v.getTag();
-            if (giftModel.getIs_lock()==0) {
+            if (giftModel.getIs_lock() == 0) {
                 EventBus.getDefault().post(new RoomGiftClickToEvent(this, giftModel, 1));
-            }else if (giftModel.getIs_lock()==1){
+            } else if (giftModel.getIs_lock() == 1) {
                 ToastUtils.show("当前属于爵位礼物，请开通爵位");
             }
         });
-        if (giftModel.getIs_lock()==0){
+        if (giftModel.getIs_lock() == 0) {
             viewHolder.iv_gift_select.setVisibility(GONE);
-        }else {
+        } else {
-            viewHolder.iv_gift_select.setVisibility(View.VISIBLE);
+            viewHolder.iv_gift_select.setVisibility(VISIBLE);
         }
+
+        if (giftModel.getIs_cp() == 0 && giftModel.getIs_teacher() == 0 ) {//这是cp礼物
+            viewHolder.im_heart.setVisibility(GONE);
+        } else {
+            if (viewHolder.im_heart != null) {
+                viewHolder.im_heart.setVisibility(VISIBLE);
+                if (giftModel.getIs_cp() == 1) {
+                    viewHolder.im_heart.setImageResource(R.mipmap.icon_heart);
+                }else if (giftModel.getIs_teacher() == 1) {
+                    viewHolder.im_heart.setImageResource(R.mipmap.icon_teacher);
+                }
+            }
+        }
+
+
         /*
          * 在给View绑定显示的数据时，计算正确的position = position + curIndex * pageSize，
          */
@@ -214,6 +233,7 @@ public class GiftRoomAdapter extends BaseAdapter {
         public TextView tv_gift_change_love_values;
         public ImageView ivDownOn;
         public ImageView iv_gift_select;
+        public ImageView im_heart;
         public ConstraintLayout cl_iv_down_on;
     }
 }

BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftTwoDetailsFragment.java

@@ -147,6 +147,8 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment<RewardGiftPresenter,
 
     @Override
     public void setGiftList(List<RoonGiftModel> data, int type) {
+        if (data == null)
+            return;
         giftList = new ArrayList<>();
         giftList.addAll(data);
         pageCount = (int) Math.ceil(data.size() * 1.0 / pageSize);
@@ -182,7 +184,7 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment<RewardGiftPresenter,
     @Override
     public void giftPack(List<GiftPackBean> giftPackBean) {
         giftPackList = new ArrayList<>();
-        if (getActivity()==null){
+        if (getActivity() == null) {
             return;
         }
 
@@ -209,7 +211,6 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment<RewardGiftPresenter,
         }
 
 
-
     }
 
     @Override
@@ -296,12 +297,18 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment<RewardGiftPresenter,
                 roonGiftModel.setNum(giftModel.getNum());
                 if (giftModel.getGift_id().equals(id)) {
                     if (!giftModel.isChecked()) {
-                        EventBus.getDefault().post(new GiftUserRefreshEvent(true, event.type, roonGiftModel));
                         giftModel.setChecked(true);
+                        roonGiftModel.setChecked(giftModel.isChecked());
+                        EventBus.getDefault().post(new GiftUserRefreshEvent(true, event.type, roonGiftModel));
+                    }else {
+                        giftModel.setChecked(false);
+                        roonGiftModel.setChecked(giftModel.isChecked());
                     }
                 } else {
                     giftModel.setChecked(false);
+                    roonGiftModel.setChecked(giftModel.isChecked());
                 }
+
             }
             if (event.adapter != null && event.adapter.get() != null) {
                 event.adapter.get().notifyDataSetChanged();
@@ -320,13 +327,20 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment<RewardGiftPresenter,
                 if (giftModel.getGift_id().equals(id)) {
                     selGift = giftModel;
                     if (!giftModel.isChecked()) {
-                        EventBus.getDefault().post(new GiftUserRefreshEvent(true, event.type, roonGiftModel));
                         giftModel.setChecked(true);
+                        roonGiftModel.setChecked(giftModel.isChecked());
+                        EventBus.getDefault().post(new GiftUserRefreshEvent(true, event.type, roonGiftModel));
+                    }else {
+                        giftModel.setChecked(false);
+                        roonGiftModel.setChecked(giftModel.isChecked());
+                        EventBus.getDefault().post(new GiftUserRefreshEvent(true, event.type, roonGiftModel));
                     }
                 } else {
                     giftModel.setChecked(false);
-                    EventBus.getDefault().post(new GiftUserRefreshEvent(false, event.type, null));
+                    roonGiftModel.setChecked(giftModel.isChecked());
+//                    EventBus.getDefault().post(new GiftUserRefreshEvent(false, event.type, roonGiftModel));
                 }
+
             }
             if (event.adapter != null && event.adapter.get() != null) {
                 event.adapter.get().notifyDataSetChanged();

BaseModule/src/main/java/com/xscm/moduleutil/adapter/LikeUser2Adapter.java

@@ -0,0 +1,29 @@
+package com.xscm.moduleutil.adapter;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.xscm.moduleutil.R;
+import com.xscm.moduleutil.bean.CircleListBean;
+import com.xscm.moduleutil.bean.room.RoomOnlineBean;
+import com.xscm.moduleutil.utils.ImageUtils;
+
+/**
+ *@author qx
+ *@data 2025/6/10
+ *@description: 显示用户小头像
+ */
+public class LikeUser2Adapter<T> extends BaseQuickAdapter<T, BaseViewHolder> {
+    public LikeUser2Adapter() {
+        super(R.layout.item_like_user);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper,T item) {
+        if (item instanceof CircleListBean.LikeList) {
+            ImageUtils.loadHeadCC(((CircleListBean.LikeList) item).getAvatar(), helper.getView(R.id.user_icon));
+        } else {
+            // 可扩展：通过接口回调获取头像 URL
+            ImageUtils.loadHeadCC(((RoomOnlineBean) item).getAvatar(), helper.getView(R.id.user_icon));
+        }
+    }
+}

BaseModule/src/main/java/com/xscm/moduleutil/adapter/LikeUserAdapter.java

@@ -13,7 +13,7 @@ import com.xscm.moduleutil.utils.ImageUtils;
  */
 public class LikeUserAdapter<T> extends BaseQuickAdapter<T, BaseViewHolder> {
     public LikeUserAdapter() {
-        super(R.layout.item_like_user);
+        super(R.layout.item_like_user_2);
     }
 
     @Override

BaseModule/src/main/java/com/xscm/moduleutil/base/BaseMvpFragment.java

@@ -11,6 +11,7 @@ import androidx.annotation.Nullable;
 import androidx.databinding.ViewDataBinding;
 import androidx.fragment.app.FragmentActivity;
 
+import com.blankj.utilcode.util.LogUtils;
 import com.xscm.moduleutil.activity.IPresenter;
 import com.xscm.moduleutil.activity.IView;
 
@@ -20,6 +21,8 @@ public abstract class BaseMvpFragment<P extends IPresenter, VDB extends ViewData
 
     protected abstract P bindPresenter();
 
+    protected boolean isShowSuccess = false;
+
     @Override
     public FragmentActivity getSelfActivity() {
         return getActivity();
@@ -37,6 +40,23 @@ public abstract class BaseMvpFragment<P extends IPresenter, VDB extends ViewData
         super.onViewCreated(view, savedInstanceState);
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        isShowSuccess = true;
+    }
+
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+        LogUtils.e("BaseMvpFragmentAAA","onHiddenChanged==="+hidden+"====="+this.getClass().getSimpleName()+"===="+isShowSuccess);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+    }
+
     @Override
     public void onDestroyView() {
         if (MvpPre != null) {

BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java

@@ -159,12 +159,11 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
         }
 
         //设置mqtt环境 false 测试环境 true 正式环境
-//        ExternalResConstants.INSTANCE.setIS_MQTT_RELEASE(false);
+//      ExternalResConstants.INSTANCE.setIS_MQTT_RELEASE(false);
         //设置http环境 false 测试环境 true 正式环境
-        ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(false);
+        ExternalResConstants.INSTANCE.setIS_HTTP_RELEASE(true);
         currentEnvironment = ExternalResConstants.INSTANCE.HTTP_PATH();
 
-
         initialization();
     }
 
@@ -439,24 +438,12 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
             if (SpUtil.isAgreePolicy()) {
                 checkInEmulator();
 //                UtilConfig.checkInEmulator();
-                AgoraManager.getInstance();
-                MessageListenerSingleton.getInstance();
-                CrashReport.initCrashReport(this, "b45883f58f", true);/*bugly初始化*/
-//                // 启动 MQTT 服务
-//                Intent mqttServiceIntent = new Intent(this, MyMqttService.class);
-//                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-//                    startForegroundService(mqttServiceIntent);
-//                } else {
-//                    startService(mqttServiceIntent);
-//                }
 
-//                mqttConnect=MqttConnect.getInstance(this, currentEnvironment.getMqttUrl(),"android-"+ MqttClient.generateClientId());
+                CrashReport.initCrashReport(this, "b45883f58f", true);/*bugly初始化*/
-//                mqttConnect=MqttConnect.getInstance(this,"tcp://1.13.101.98","android-"+ MqttClient.generateClientId());
-//                mqttConnect.mqttClient();
 
                 // 每次启动应用时重置状态
                 SpUtil.getInstance().setBooleanValue("youth_model_shown", false);
-                startInitSdk();
+
                 // 初始化（通常在Application或Activity的onCreate中）
                 CosUploadManager.getInstance(CommonAppContext.getInstance());
             }
@@ -528,9 +515,12 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
     public void upMqtt(){
         if (mqttConnect == null){
             mqttConnect=MqttConnect.getInstance(this,  currentEnvironment.getMqttUrl(),"android-"+ MqttClient.generateClientId());
-//                mqttConnect=MqttConnect.getInstance(this,"tcp://1.13.101.98","android-"+ MqttClient.generateClientId());
             mqttConnect.mqttClient();
         }
+
+        AgoraManager.getInstance();
+        MessageListenerSingleton.getInstance();
+        startInitSdk();
     }
 
     @Override
@@ -765,6 +755,11 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
         // 每次启动应用时重置状态
         SpUtil.setBooleanValue("youth_model_shown", false);
 
+        if (mqttConnect != null){
+            mqttConnect.close();
+        }
+
+
         // 发送广播通知所有Activity刷新状态
         Intent refreshIntent = new Intent("com.xscm.moduleutil.ACTION_USER_LOGOUT");
         sendBroadcast(refreshIntent);
@@ -808,7 +803,7 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
             AppLifecycleUtil.onAppFrontGround();
         }
         if (playId!=null && !playId.equals("")){
-            RetrofitClient.getInstance().userRoomBack(playId, "2");
+//            RetrofitClient.getInstance().userRoomBack(playId, "2");
         }
         activityCount++;
     }
@@ -823,7 +818,7 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
             }
 
             if (playId!=null && !playId.equals("")){
-                RetrofitClient.getInstance().userRoomBack(playId, "1");
+//                RetrofitClient.getInstance().userRoomBack(playId, "1");
             }
 
             AppLifecycleUtil.onAppBackGround();

BaseModule/src/main/java/com/xscm/moduleutil/base/WebUrlConstants.kt

@@ -23,7 +23,7 @@ object WebUrlConstants {
     val WEB_PROP_MALL_URL = BASE_URL + "/web/index.html#/pages/prop/propMall?id=%s"
 
     /**公会*/
-    val WEB_GUILD_URL = BASE_URL + "/web/index.html#/pages/union/index?id=%s"
+    val WEB_GUILD_URL = BASE_URL + "/web/index.html#/pages/union/index?id=%s&guild_id=%s"
 
     /**等级*/
     val WEB_GRADE_URL = BASE_URL + "/web/index.html#/pages/other/grade?id=%s"

BaseModule/src/main/java/com/xscm/moduleutil/bean/CombinedGiftBean.java

@@ -1,5 +1,6 @@
 package com.xscm.moduleutil.bean;
 
+import java.io.Serializable;
 import java.util.List;
 
 import lombok.Data;
@@ -10,7 +11,7 @@ import lombok.Data;
  * @Description $
  */
 @Data
-public class CombinedGiftBean {
+public class CombinedGiftBean implements Serializable {
     private int gift_id;
     private String gift_price;
     private String gift_name;
@@ -21,7 +22,7 @@ public class CombinedGiftBean {
     private boolean is_liang;
 
     @Data
-    public static class TopUsers {
+    public static class TopUsers implements Serializable{
         private int user_id;
         private String nickname;
         private String avatar;

BaseModule/src/main/java/com/xscm/moduleutil/bean/FamilyEarnings.kt

@@ -0,0 +1,34 @@
+package com.xscm.moduleutil.bean
+
+/**
+ * 项目名称：羽声语音
+ * 时间：2025/11/27 16:47
+ * 用途：
+ */
+class FamilyEarnings {
+
+    var id: Int=0
+    var nickname: String=""
+    var avatar: String=""
+    var user_code: String=""
+    var earnings: String=""
+    var createtime: Long=0
+    var gift_name: String=""
+    var gift_price: String=""
+
+   /* id 列表 id
+   
+    nickname 用户昵称
+   
+    avatar
+   
+    user_code
+   
+    earnings  收益
+    createtime
+
+    gift_name 礼物名称
+   
+    gift_price 礼物价格*/
+
+}

BaseModule/src/main/java/com/xscm/moduleutil/bean/GiftBoxBean.java

@@ -3,16 +3,18 @@ package com.xscm.moduleutil.bean;
 import java.util.List;
 
 import lombok.Data;
+
 /**
- *@author qx
+ * @author qx
- *@data 2025/5/27
+ * @data 2025/5/27
- *@description: 礼盒数据
+ * @description: 礼盒数据
  */
 @Data
 public class GiftBoxBean {
     private String user_gold;//累计获取的金币
     private List<GiftBean> gift_box_list;
-    private TaskDataBean tasks;
+    private List<TaskDataBean> tasks;
+
     @Data
     public static class GiftBean {
 //        private String giftName; //初级礼盒、高级礼盒
@@ -21,10 +23,25 @@ public class GiftBoxBean {
 //        private String giftTypeNumber; //当前的百分比
 //        private String giftTypeStatus; //是否已经可以
 
+
+        /*{
+                "id":2,
+                "name":"高级礼盒",
+                "title":"最高可获得10000金币",
+                "icon":"",
+                "highest_gain":"10000",
+                "meet":"300",
+                "unlock_progress":0,
+                "all_number":"1",
+                "taday_number":0,
+                "taday_number_left":1,
+                "status":0,
+                "status_str":"未解锁"
+        }*/
         private String id;//礼盒ID
         private String name;//礼盒名称
         private String title; //标题
-        private String icon ;//图标
+        private String icon;//图标
         private String highest_gain;//最高获得金币数
         private String meet;//满多少金币可抽
         private String unlock_progress;// //解锁进度
@@ -37,23 +54,62 @@ public class GiftBoxBean {
 
     @Data
     public static class TaskDataBean {
-        private List<DailyTasksBean> daily_tasks;
+        private List<DailyTasksBean> task_list;
-        private List<DailyTasksBean> daily_tasks_special;
+//        private List<DailyTasksBean> daily_tasks_special;
-        private List<DailyTasksBean> usual_tasks;
+//        private List<DailyTasksBean> usual_tasks;
+//        private List<DailyTasksBean> teacher_tasks;
+
+        private int task_type_id;
+        private String task_type_name;
 
         @Data
         public static class DailyTasksBean {
-           private int task_id;////任务Id
+
-           private String task_name;//任务名称
+           /* {
-           private String icon;//图标
+                    "task_id":20,
-           private int gold_reward; //奖励金币
+                    "icon":null,
-           private int target_quantity;//目标完成数量
+                    "task_name":"每日在房间时长 15 分钟(0/15)",
-           private int task_type;//任务类型 1每日任务 2每日特殊任务 3平台常规任务
+                    "target_quantity":900,
-           private int task_status;//任务状态：1完成  2去领取 3已领取
+                    "task_type":2,
-           private String task_type_str; //任务状态
+                    "jump_type":4,
-           private int processing_type;//跳转状态：
+                    "tasks_bag_id":0,
-           private String processing_type_str;//跳转状态
+                    "task_status":1,
-           private String from_id;
+                    "task_type_str":"去完成",
+                    "jump_type_str":"跳转房间",
+                    "from_id":6040,
+                    "is_time":1,
+                    "processing_type":2,
+                    "processing_type_str":"去观看",
+                    "reward_str":"25金币，笨笨狗x1,
+                仙女之星头像框,
+                        三八大杠"
+            }*/
+
+            private int task_id;////任务Id
+            private String icon;//图标
+            private String task_name;//任务名称
+            private int target_quantity;//目标完成数量
+            private int task_type;//任务类型 1每日任务 2每日特殊任务 3平台常规任务
+            /**
+             * 0  不跳转
+             * 1  跳转实名
+             * 2  跳转我的相册
+             * 3  跳转绑定管理
+             * 4  跳转房间
+             * 5  跳转申请加入公会
+             * 6  跳转充值
+             */
+            private int jump_type; //跳转类型
+            private int tasks_bag_id; //任务礼盒ID
+            private int task_status;//任务状态：1完成  2去领取 3已领取
+            private String task_type_str; //任务状态
+            private String jump_type_str; //跳转类型提示
+            private String from_id;
+            private int is_time;
+            private int processing_type;//跳转状态：
+            private String processing_type_str;//跳转状态
+            private String reward_str;//1：奖励
+            private String student_id;//徒弟ID
         }
 
     }

BaseModule/src/main/java/com/xscm/moduleutil/bean/GiftUserWallBean.java

@@ -1,5 +1,6 @@
 package com.xscm.moduleutil.bean;
 
+import java.io.Serializable;
 import java.util.List;
 
 import lombok.Data;
@@ -10,11 +11,11 @@ import lombok.Data;
  * @Description $ 礼物墙展示接口
  */
 @Data
-public class GiftUserWallBean {
+public class GiftUserWallBean implements Serializable {
     private List<GiftWallBean> liang;
     private List<GiftWallBean> no_liang;
     @Data
-    public static  class GiftWallBean {
+    public static  class GiftWallBean implements Serializable {
         private int gift_id;
         private String gift_price;
         private String gift_name;

BaseModule/src/main/java/com/xscm/moduleutil/bean/HeartCpBean.kt

@@ -0,0 +1,102 @@
+package com.xscm.moduleutil.bean
+
+import java.io.Serializable
+
+class HeartCpBean : Serializable {
+
+
+    /*  {
+          "code": 1,
+          "msg": "\u6210\u529f",
+          "data": {
+          "id": 1,
+          "user_id1": 20001,
+          "user_id2": 20003,
+          "status": 1,
+          "level": 1,
+          "exp": 9198,
+          "createtime": 1763720783,
+          "user_info1": {
+          "user_id": 20001,
+          "nickname": "\u9ad8\u5174\u7684\u5c0f\u6d77\u817e",
+          "avatar": "https:\/\/yusheng-1369267578.cos.ap-guangzhou.myqcloud.com\/images\/ios_images\/1761615690733.jpeg"
+              },
+          "user_info2": {
+          "user_id": 20003,
+          "nickname": "\u79c0\u4e3d\u7684\u978b\u57ab",
+          "avatar": "https:\/\/yusheng-1369267578.cos.ap-guangzhou.myqcloud.com\/images\/android_images\/33e31b18577856c4f10906b7cabaa698.jpg"
+              },
+          "next_level_exp": 802,
+          "pendant": "https:\/\/cos.xscmmidi.site\/admin\/520liuxingyu_17637096968287.mp4",
+          "gift_log": [
+          {
+              "id": 323,
+              "room_id": 6003,
+              "from_user_id": 20001,
+              "to_user_id": 20003,
+              "gift_id": 313,
+              "num": 1,
+              "cp_zone_id": 1,
+              "exp": "1314",
+              "exp_total": "9198",
+              "remark": "\u9001\u7ed9\u79c0\u4e3d\u7684\u978b\u57ab1\u4e2a\u9e4a\u7f18\u7ec7\u68a6,\u83b7\u5f971314\u7ecf\u9a8c\u503c\uff0c\u603b\u7ecf\u9a8c\u503c\u589e\u52a0\u81f39198",
+              "createtime": 1763796118,
+              "gift_name": "\u9e4a\u7f18\u7ec7\u68a6",
+              "from_user_info": {
+              "user_id": 20001,
+              "nickname": "\u9ad8\u5174\u7684\u5c0f\u6d77\u817e",
+              "avatar": "https:\/\/yusheng-1369267578.cos.ap-guangzhou.myqcloud.com\/images\/ios_images\/1761615690733.jpeg"
+          },
+              "to_user_info": {
+              "user_id": 20003,
+              "nickname": "\u79c0\u4e3d\u7684\u978b\u57ab",
+              "avatar": "https:\/\/yusheng-1369267578.cos.ap-guangzhou.myqcloud.com\/images\/android_images\/33e31b18577856c4f10906b7cabaa698.jpg"
+          }
+          }]
+      },
+          "api_version": ""
+      }*/
+
+    var id: Int = 0
+    var user_id1: Int = 0
+    var user_id2: Int = 0
+    var status: Int = 0
+    var level: Int = 0
+    var exp: Long = 0
+    var createtime: Long = 0
+    var user_info1: UserInfo = UserInfo()
+    var user_info2: UserInfo = UserInfo()
+    var next_level_exp: Long = 0
+    var pendant: String = ""
+    var gift_log: List<GiftLog> = ArrayList()
+    var api_version: String = ""
+
+    class GiftLog : Serializable {
+        var id: Int = 0
+        var room_id: Int = 0
+        var from_user_id: Int = 0
+        var to_user_id: Int = 0
+        var gift_id: Int = 0
+        var num: Int = 0
+        var cp_zone_id: Int = 0
+        var exp: String = ""
+        var exp_total: String = ""
+        var remark: String = ""
+        var createtime: Long = 0
+        var gift_name: String = ""
+        var from_user_info: UserInfo = UserInfo()
+        var to_user_info: UserInfo = UserInfo()
+
+        class UserInfo : Serializable {
+            var user_id: Int = 0
+            var nickname: String = ""
+            var avatar: String = ""
+        }
+    }
+
+    class UserInfo : Serializable {
+        var user_id: Int = 0
+        var nickname: String = ""
+        var avatar: String = ""
+    }
+}

BaseModule/src/main/java/com/xscm/moduleutil/bean/IndexRecommendRoom.kt

@@ -0,0 +1,18 @@
+package com.xscm.moduleutil.bean
+
+/**
+ * 项目名称：羽声语音
+ * 时间：2025/12/8 16:30
+ * 用途：首页弹框推荐房间
+ */
+class IndexRecommendRoom {
+    var room_id: String? = ""
+    var user_id: String? =""
+    var room_name: String? = ""
+    var room_cover: String? = ""
+
+   /* "id": "string",
+    "user_id": "string",
+    "room_name": "string",
+    "room_cover": "string"*/
+}

BaseModule/src/main/java/com/xscm/moduleutil/bean/MyFamilyBean.kt

@@ -0,0 +1,95 @@
+package com.xscm.moduleutil.bean
+
+/**
+ * 项目名称：羽声语音
+ * 时间：2025/11/26 18:45
+ * 用途：
+ */
+class MyFamilyBean {
+    var group_id: String = ""  //群组id
+    var name: String = "" //家族名称
+    var user_id: Int = 0 //族长id
+    var group_members_num: Int = 0 //签约次数  群组人数
+    var group_earnings: String = "" //总计收益
+
+    var group_owner_info: GroupOwnerInfoBean? = null //族长信息
+
+     class GroupOwnerInfoBean {
+
+        var nickname: String = "" //昵称
+        var avatar: String = ""  //头像
+        var dress: String = ""   //头像框
+        var user_code: String = "" //用户id
+        var icon: List<String> = arrayListOf()
+        var mic_cycle: String = "" //麦圈
+        var nobility_image: String = "" //贵族
+        var nickname_color: String = "" //贵族颜色
+    }
+
+    var group_members_lists: List<GroupMembersListsBean> = arrayListOf() //
+
+    class GroupMembersListsBean{
+        var market_value: String = "" //身价
+        var nickname: String = ""
+        var avatar: String = ""
+        var user_code: String = ""
+        var user_id: Int = 0
+        var end_time: Long = 0 //签约到期时间点
+        var dress: String = ""
+        var icon: List<String> = arrayListOf()
+        var mic_cycle: String = "" //麦圈
+        var nobility_image: String = "" //贵族
+        var nickname_color: String = "" //贵族颜色
+        var free_renewal: Int = 0 //免费续签次数
+        var today_earnings: Double = 0.0 //今日收礼收益
+        var yesterday_earnings: Double = 0.0 //昨日收礼收益
+        var is_online: Int = 0 //是否在线 1在线 0离线
+        var is_show_sign: Int = 0 //是否显示续约按钮 1：显示 0：不显示
+
+        var sign_times: Int = 0 //非首签签约时长
+        var sign_user_ratio : Int = 0 //非首签签约比例
+        var end_day: String = "" //签约剩余时长
+
+        val free_re_sign_day : Int=0 //免费续签时长
+
+    }
+
+    /* "group_id": "string",
+     "name": "string",
+     "user_id": "string",
+     "group_members_num": "string",
+     "group_earnings": "string",
+     "group_owner_info": {
+         "nickname": "string",
+         "avatar": "string",
+         "dress": "string",
+         "user_code": "string",
+         "icon": [
+         "string"
+         ],
+         "mic_cycle": "string",
+         "nobility_image": "string",
+         "nickname_color": "string"
+     },
+     "group_members_lists": [
+     {
+         "market_value": "string",
+         "nickname": "string",
+         "avatar": "string",
+         "user_code": "string",
+         "user_id": "string",
+         "end_time": "string",
+         "dress": "string",
+         "icon": [
+         "string"
+         ],
+         "mic_cycle": "string",
+         "nobility_image": "string",
+         "nickname_color": "string",
+         "free_renewal": "string",
+         "today_earnings": "string",
+         "yesterday_earnings": "string"
+     }
+     ]
+ }*/
+}

BaseModule/src/main/java/com/xscm/moduleutil/bean/NewsMessageList.java

@@ -10,7 +10,7 @@ import lombok.Data;
 @Data
 public class NewsMessageList {
     private int id;
-    private int type;//类型 1：系统消息 2：官方公告 3：活动中心
+    private int type;//类型 1：系统消息 2：官方公告 3：活动中心 6：邀请加入公会
     private int admin_id;
     private String title;//标题
     private String content;//内容
@@ -22,4 +22,5 @@ public class NewsMessageList {
     private String createtime;
     private String updatetime;
     private String delete_time;
+    private int guild_invited_status;
 }

BaseModule/src/main/java/com/xscm/moduleutil/bean/PlaceholderBean.java

@@ -58,7 +58,7 @@ public class PlaceholderBean {
         private String nickname1;
         private String avatar;
         private String total;
-        private String rank;
+        private String rank="";
         private List<String> icon;
         private String room_name;
         private String room_id;

BaseModule/src/main/java/com/xscm/moduleutil/bean/RelationBean.kt

@@ -0,0 +1,73 @@
+package com.xscm.moduleutil.bean
+
+import com.chad.library.adapter.base.entity.MultiItemEntity
+import lombok.Data
+import java.util.ArrayList
+
+/**
+ * 项目名称：羽声语音
+ * 时间：2025/11/20 15:13
+ * 用途：心动空间中的关系实体
+ */
+@Data
+class RelationBean : MultiItemEntity {
+
+    var cp: UserInfo.CpInfo = UserInfo.CpInfo()
+    var no_cp: List<NoCpBean> = ArrayList()
+    override fun getItemType(): Int {
+
+        // 情况3：no_cp集合，relation_name不等于""，并且relation_list的大小是1
+        if (no_cp.isNotEmpty() && no_cp[0].relation_name.isNotEmpty() && no_cp[0].relation_list.size == 1) {
+            return 3
+        }
+
+        // 情况4：no_cp集合，relation_list的大小是1
+        if (no_cp.isNotEmpty() && no_cp[0].relation_list.size == 1) {
+            return 4
+        }
+
+        if (no_cp.isNotEmpty() && no_cp[0].relation_name.isNotEmpty() && no_cp[0].relation_list.size > 1){
+            return 5
+        }
+
+        // 其他情况返回5
+        return 6
+    }
+
+    class NoCpBean : MultiItemEntity{
+        var relation_name: String = ""
+        var relation_list: List<RelationshipBean> = ArrayList()
+    override fun getItemType(): Int {
+        return 0
+    }
+
+}
+
+
+    /*"cp": [
+    {
+        "relation_name": "string",
+        "relation_list": [
+        {
+            "nickname1": "string",
+            "avatar1": "string",
+            "user_id1": "string"
+        }
+        ]
+    }
+    ],
+    "no_cp": [
+    {
+        "relation_name": "string",
+        "relation_list": [
+        {
+            "user_info1": {},
+            "user_info2": "string",
+            "level": "string",
+            "exp": "string"
+        }
+        ]
+    }
+    ]
+}*/
+}

BaseModule/src/main/java/com/xscm/moduleutil/bean/RelationshipBean.java

@@ -1,5 +1,7 @@
 package com.xscm.moduleutil.bean;
 
+import com.chad.library.adapter.base.entity.MultiItemEntity;
+
 import java.io.Serializable;
 
 import lombok.Data;
@@ -10,7 +12,7 @@ import lombok.Data;
  * @description: 关系信息
  */
 @Data
-public class RelationshipBean implements Serializable {
+public class RelationshipBean implements Serializable, MultiItemEntity {
 
 
     private int relation_id;//关系id 3,
@@ -31,4 +33,14 @@ public class RelationshipBean implements Serializable {
     private int heart_value;// 0,
     private int is_top;// 0
     private int type;// 1,亲密；2：真爱
+    private int sex1;//1：女 2：男
+    private int sex2;//
+    private String dress1;//
+    private String dress2;//
+
+
+    @Override
+    public int getItemType() {
+        return 0;
+    }
 }

BaseModule/src/main/java/com/xscm/moduleutil/bean/RoomGiftData.java

@@ -0,0 +1,38 @@
+package com.xscm.moduleutil.bean;
+
+import com.xscm.moduleutil.BaseEvent;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.List;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 送礼后的成功回调
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class RoomGiftData extends BaseEvent {
+    private int gift_total;
+
+    private List<GiftUserData> gift_user_data;
+
+    private CpType cp_type;
+
+    @Data
+    public static class GiftUserData {
+        private String user_id;//受理人id
+        private String gift_price;//礼物价格
+    }
+
+    @Data
+    public static class CpType {
+        private int cp_type;//0：不处理 1：表明心意 2：组成cp
+        private String text;//发送方弹起的信息
+        private String text1;//接收方弹起的信息
+        private int gift_id;//礼物id
+    }
+
+}

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

@@ -1,14 +1,17 @@
 package com.xscm.moduleutil.bean;
 
+import com.xscm.moduleutil.BaseEvent;
 import com.xscm.moduleutil.bean.blindboxwheel.BlindBoxBean;
 import com.xscm.moduleutil.bean.room.*;
 
 import java.util.List;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class RoomMessageEvent {
+public class RoomMessageEvent extends BaseEvent {
     private int MsgType; // 消息类型，如 QXRoomMessageTypeJoin
     private String RoomId; // 房间 ID
     private T Text; // 携带的数据对象
@@ -50,7 +53,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;
 
@@ -64,11 +67,11 @@ public class RoomMessageEvent {
         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接收的
@@ -97,12 +100,27 @@ public class RoomMessageEvent {
 
         private EmotionDeatils emoji;
         private String is_pk;//是否是pk
+
+        private SingerInfo.SongInfo song_info;
+        private SingerInfo.SongInfo next_song_info;
+
+        private String rights_icon;//Cp特效
+
+        private String sign_id = "-1";//签约ID
+        private String sign_value;//签约最高价
+        private String sign_day;//被签约天数
+        private String current_body_value;//被签约身价
+
+        private String status = "";
+        private String from_id = "";
+
     }
 
     @Data
     public static class text {
         private long position;
         private int is_mute;
+        private RoomGiftData.CpType cp_type;
     }
 }
 

BaseModule/src/main/java/com/xscm/moduleutil/bean/RoomTypeModel.java

@@ -21,5 +21,6 @@ public class RoomTypeModel {
     private String label_name;
     private String type;
     private String sort;
+    private int  default_index; //1 选中   0 未选中
 
 }

BaseModule/src/main/java/com/xscm/moduleutil/bean/RoonGiftModel.java

@@ -34,6 +34,9 @@ public class RoonGiftModel {
     private int activities_id;//4：盲盒 ；5：天空之境；
     private int gift_bag;//10：天空之境 11：岁月之城 12：时空之巅
     private int is_lock;//爵位礼物 0：不锁 1：锁
+
+    private int is_cp;//1:是 0：不是 是不是cp心动礼物
+    private int is_teacher;//1:是 0：不是 是不是师徒礼物
     public boolean isCan_send_self() {
         if ( isManghe()) {
             return true;

BaseModule/src/main/java/com/xscm/moduleutil/bean/SignInData.kt

@@ -0,0 +1,115 @@
+package com.xscm.moduleutil.bean
+
+import com.chad.library.adapter.base.entity.MultiItemEntity
+
+/**
+ * 项目名称：羽声语音
+ * 时间：2025/12/12 10:35
+ * 用途：签到实体类
+ */
+class SignInData : MultiItemEntity{
+    val TYPE_NORMAL: Int = 0 // 普通类型，使用day_sgin布局
+    val TYPE_DOUBLE: Int = 1 // 双倍宽度类型，使用day_sgin2布局
+    var viewType: Int = TYPE_NORMAL // 默认为普通类型
+
+    var day: Int = 0 //第几天
+    var sign_in_date: String = "" //日期
+    var sign_in_status: Int = 0 // 签到状态：1已签到 0未签到
+    var sign_in_status_str: String = "" //已签到
+    var is_today: Int = 0 //是否是当天 0否  1是
+    var gift_name: String = "" //礼物名称
+    var num: String = "" //数量
+    var gift_price: Int = 0 //价格
+    var type: Int = 0 //类型： 1金币 2礼物 3装扮 4钻石
+    var base_image: String = "" //礼物图片
+    override fun getItemType(): Int {
+        return viewType
+    }
+
+    /*  "gift_bag": [
+      {
+          "day": 1, //第几天
+          "sign_in_date": "2025-12-09", //日期
+          "sign_in_status": 1, //签到状态：1已签到 0未签到
+          "sign_in_status_str": "已签到",
+          "is_today": 0, //是否是当天 0否  1是
+          "gift_name": "金币", //礼物名称
+          "num": 1, //数量
+          "gift_price": 1, //价格
+          "type": 1, //类型： 1金币 2礼物 3装扮 4钻石
+          "base_image": "https://test.vespa.qxyushen.top/static/image/icon/gold.png" //礼物图片
+      },
+      {
+          "day": 2,
+          "sign_in_date": "2025-12-10",
+          "sign_in_status": 1,
+          "sign_in_status_str": "已签到",
+          "is_today": 0,
+          "gift_name": "打工狗",
+          "num": "1 个",
+          "gift_price": "9",
+          "type": 2,
+          "base_image": "https://cos.xscmmidi.site/admin/3143tianxuanbanzhuangou_17615346376493.png"
+      },
+      {
+          "day": 3,
+          "sign_in_date": "2025-12-11",
+          "sign_in_status": 1,
+          "sign_in_status_str": "已签到",
+          "is_today": 0,
+          "gift_name": "神皇",
+          "num": "3 天",
+          "gift_price": 30,
+          "type": 3,
+          "base_image": "https://midi01.oss-cn-beijing.aliyuncs.com/5544shenhuang_17579016149523.png"
+      },
+      {
+          "day": 4,
+          "sign_in_date": "2025-12-12",
+          "sign_in_status": 1,
+          "sign_in_status_str": "已签到",
+          "is_today": 1,
+          "gift_name": "心动喷发",
+          "num": "2 个",
+          "gift_price": "100",
+          "type": 2,
+          "base_image": "https://cos.xscmmidi.site/admin/3300xindongpenfa_17615347008740.png"
+      },
+      {
+          "day": 5,
+          "sign_in_date": "2025-12-13",
+          "sign_in_status": 0,
+          "sign_in_status_str": "未签到",
+          "is_today": 0,
+          "gift_name": "钻石",
+          "num": 20,
+          "gift_price": 1,
+          "type": 4,
+          "base_image": "https://test.vespa.qxyushen.top/static/image/icon/gold.png"
+      },
+      {
+          "day": 6,
+          "sign_in_date": "2025-12-14",
+          "sign_in_status": 0,
+          "sign_in_status_str": "未签到",
+          "is_today": 0,
+          "gift_name": "王者之戒",
+          "num": "1 个",
+          "gift_price": "19",
+          "type": 2,
+          "base_image": "https://cos.xscmmidi.site/admin/5390wangzhezhijie_17615353361010.png"
+      },
+      {
+          "day": 7,
+          "sign_in_date": "2025-12-15",
+          "sign_in_status": 0,
+          "sign_in_status_str": "未签到",
+          "is_today": 0,
+          "gift_name": "财源滚滚",
+          "num": "30 天",
+          "gift_price": 288,
+          "type": 3,
+          "base_image": "https://midi01.oss-cn-beijing.aliyuncs.com/2160caiyuangunguntouxiangkuang_17579008394073.png"
+      }
+      ]*/
+}

BaseModule/src/main/java/com/xscm/moduleutil/bean/SignInfo.kt

@@ -0,0 +1,21 @@
+package com.xscm.moduleutil.bean
+
+import java.io.Serializable
+
+class SignInfo : Serializable {
+/*    sign_id
+    // 0 未开始   1进行中
+    sign_status;
+// 签约天数
+    sign_day;
+// 当前身价
+    current_body_value;
+// 倒计时 时间戳
+    end_time;*/
+
+    var sign_id: String = ""
+    var sign_status: Int = 0
+    var sign_day: Int = 0
+    var current_body_value: Int = 0
+    var end_time: Long = 0
+}

BaseModule/src/main/java/com/xscm/moduleutil/bean/SingerInfo.java

@@ -0,0 +1,54 @@
+package com.xscm.moduleutil.bean;
+
+import java.io.Serializable;
+
+import lombok.Data;
+
+@Data
+public class SingerInfo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private SongInfo song_info;
+    private SongInfo next_song_info;
+
+    @Data
+   public static class SongInfo implements Serializable{
+        private static final long serialVersionUID = 1L;
+        /*"id": 29,
+                "room_id": 6001,
+                "user_id": 20001,
+                "singer_song_id": 9,
+                "status": 1,
+                "sort": 0,
+                "createtime": 1763435086,
+                "boss_user_id": 20001,
+                "boss_nickname": "高兴的小海腾",
+                "boss_avatar": "https://yusheng-1369267578.cos.ap-guangzhou.myqcloud.com/images/ios_images/1761615690733.jpeg",
+                "boss_dress": "",
+                "boss_mic_cycle": "https://cos.xscmmidi.site/admin/ripple3695_17627709565119.svga",
+                "singer_user_id": 20000,
+                "singer_nickname": "坚定的故事",
+                "singer_avatar": "https://yusheng-1369267578.cos.ap-guangzhou.myqcloud.com/images/android_images/4ead5077435f1da7b8aae1a878bb5ac9.jpg",
+                "singer_dress": "",
+                "singer_mic_cycle": "https://cos.xscmmidi.site/admin/ripple3695_17627709565119.svga",
+                "song_name": "公敌"*/
+        private int id = 0;
+        private int room_id = 0;
+        private int user_id = 0;
+        private int singer_song_id = 0;
+        private int status = 0;
+        private int sort = 0;
+        private long createtime = 0;
+        private int boss_user_id = 0;
+        private String boss_nickname = "";
+        private String boss_avatar = "";
+        private String boss_dress = "";
+        private String boss_mic_cycle = "";
+        private int singer_user_id = 0;
+        private String singer_nickname = "";
+        private String singer_avatar = "";
+        private String singer_dress = "";
+        private String singer_mic_cycle = "";
+        private String song_name = "";
+    }
+
+}

BaseModule/src/main/java/com/xscm/moduleutil/bean/SingerSongCount.kt

@@ -0,0 +1,40 @@
+package com.xscm.moduleutil.bean
+
+/**
+ * SingerSongCount 类，用于存储歌手和歌曲数量信息
+ * 这个类可能用于统计或展示每位歌手的歌曲数量
+ */
+class SingerSongCount {
+    // 类定义结束，这里可以添加属性和方法来存储和操作歌手及其歌曲数量
+
+    var total: Int = 0
+    var today: Int = 0
+    var yesterday: Int = 0
+    var week: Int = 0
+    var month: Int = 0
+    var already: Int = 0
+
+ /*   total
+    string
+    总数
+    必需
+    today
+    string
+    今天
+    必需
+    yesterday
+    string
+    昨天
+    必需
+    week
+    string
+    本周
+    必需
+    month
+    string
+    本月
+    必需
+    already
+    string
+    已点*/
+}

BaseModule/src/main/java/com/xscm/moduleutil/bean/SongPlaylist.kt

@@ -0,0 +1,67 @@
+package com.xscm.moduleutil.bean
+
+class SongPlaylist {
+
+    var count: Int = 0
+    var lists: List<SongPlaylistBean> = ArrayList()
+
+    class SongPlaylistBean {
+
+        var id: Int = 0
+        var room_id :String =""
+        var user_id: String = ""
+        var singer_song_id: String = ""
+        var status:String =""
+        var sort: Int = 0
+        var boss_nickname: String = ""
+        var song_name: String = ""
+        var gift_id: String = ""
+        var gift_num: String = ""
+        var createtime: String = ""
+        var gift_name: String = ""
+        var gift_price: String = ""
+        var base_image: String = ""
+        var singer_nickname: String = ""
+
+    }
+
+    /* id
+     string 列表ID
+
+     user_id
+     string
+     歌手ID
+
+     song_name
+     string
+     歌曲名
+
+     gift_id
+     string
+     礼物ID
+
+     gift_num
+     string
+     礼物数量
+
+     createtime
+     string
+     添加时间
+
+     gift_name
+     string
+     礼物名称
+
+     gift_price
+     string
+     礼物价格
+
+     base_image
+     string
+     礼物图片
+
+     nickname
+     string
+     歌手昵称*/
+
+}

BaseModule/src/main/java/com/xscm/moduleutil/bean/TasksSignStatus.kt

@@ -0,0 +1,11 @@
+package com.xscm.moduleutil.bean
+
+/**
+ * 项目名称：羽声语音
+ * 时间：2025/12/12 14:54
+ * 用途：签到状态
+ */
+class TasksSignStatus {
+    var status : Int=0
+    var status_str: String=""
+}

BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java

@@ -1,5 +1,6 @@
 package com.xscm.moduleutil.bean;
 
+import com.chad.library.adapter.base.entity.MultiItemEntity;
 import com.google.gson.annotations.SerializedName;
 import com.xscm.moduleutil.BaseEvent;
 import com.xscm.moduleutil.bean.room.FriendInfo;
@@ -11,9 +12,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- *@author qx
+ * @author qx
- *@data 2025/6/3
+ * @data 2025/6/3
- *@description: 个人信息，点击我的获取
+ * @description: 个人信息，点击我的获取
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
@@ -34,11 +35,12 @@ public class UserInfo extends BaseEvent implements Serializable {
     private int charm_level; //魅力等级
     private int is_use_code; //是否是靓号 0否 1是
     private String tencent_im;
+    private String token;
     private String jia_jia;//坐骑
     private int is_in_pit;//是否在麦上，1在0不在
     private int is_open_live_remind;//是否设置开播提醒
     private String birthday;//生日
-    private String profile;//简介
+    private String profile = "";//简介
     private String home_bgimages;//背景图片
     private int is_follow;//是否关注
     private List<UserTagBean> tag_list;
@@ -49,7 +51,10 @@ public class UserInfo extends BaseEvent implements Serializable {
     private String chat_bubble;//聊天气泡
     private String charm;//魅力值
     private String room_id;
-    private String guild;//公会名称
+    private String guild_name = "";//公会名称
+    private int guild_id = 0;//公会id
+    private String me_guild_name = "";//公会名称
+    private int me_guild_id = 0;//公会id
     private String is_mute;//禁言状态 0否 1是
     private String is_mute_pit;//禁麦状态 0否 1是
     private String is_manager;//是否是管理员 0否 1是
@@ -66,6 +71,7 @@ public class UserInfo extends BaseEvent implements Serializable {
 
     private RelationshipBean qinmi;
     private RelationshipBean zhenai;
+    private String mobile;//手机号
 
     private int heartId; //  "heartId": 4,
     private int heartNum; //
@@ -76,12 +82,95 @@ public class UserInfo extends BaseEvent implements Serializable {
     private String nickname_color = "";//昵称颜色
     private String mic_cycle;//麦圈
     private String is_hide;//0不能设置，1：可以设置
-    private String  hide_status;//0-取消隐身，1-设置隐身
+    private String hide_status;//0-取消隐身，1-设置隐身
 
     private String enter_image;//爵位飘屏的背景
     private String enter_text;//爵位飘屏的文字
+    private int singer_status;//歌手认证状态0-待审核，1-通过，2-拒绝 -1：未认证
+    private int singer_level;//歌手等级
+    private CpInfo cp_info;
+    private int market_value;//身价
+    private String market_value_coin="";//身价配置 多少金币数
+    private String market_value_market="";//身价配置 多少身价数
 
+    private String sign_value;
+    private String sign_id;
 
+    private Master master;
+    private int is_online;//是否在线 : 1在线 2离线
+
+    @Data
+    public static class Master implements Serializable {
+        private String user_id;
+        private String nickname;
+        private String avatar;
+    }
+
+    /*"cp_info": {
+      "name": "string",
+              "user_id1": "string",
+              "user_id2": "string",
+              "level": "string",
+              "exp": "string",
+              "pendant": "string",
+              "direction": "string",
+
+  }*/
+
+    @Data
+    public static class CpInfo implements Serializable, MultiItemEntity {
+        private int id;
+        private int user_id1;
+        private int user_id2;
+        private int status;
+
+        private long createtime;
+
+        public String name = "-1";
+        public String level = "-1";
+        public String exp = "-1";
+        public String pendant = "-1";
+        public String direction = "-1";
+        public UserInfo1 user_info1;
+        public UserInfo2 user_info2;
+
+        @Override
+        public int getItemType() {
+            if (name != null && !name.isEmpty()) {
+                return 1;
+            }
+            return 2;
+        }
+
+        @Data
+        public static class UserInfo1 implements Serializable {
+            public String user_id;
+            public String nickname;
+            public String avatar;
+            public String dress;
+        }
+
+        @Data
+        public static class UserInfo2 implements Serializable {
+            public String user_id;
+            public String nickname;
+            public String avatar;
+            public String dress;
+        }
+         /*"user_info1": {
+              "user_id": "string",
+                      "nickname": "string",
+                      "avatar": "string",
+                      "dress": "string"
+          },
+                  "user_info2": {
+              "user_id": "string",
+                      "nickname": "string",
+                      "avatar": "string",
+                      "dress": "string"
+          }*/
+
+    }
 
     //    @Data
 //    public static class  TagList{
@@ -89,13 +178,14 @@ public class UserInfo extends BaseEvent implements Serializable {
 //        private String tag_name;
 //    }
     @Data
-    public static class  GiftWall {
+    public static class GiftWall implements Serializable {
         private String gift_name;
         private String total;
 
         private List<SendUserInfo> send_user_info;
+
         @Data
-        public static class  SendUserInfo{
+        public static class SendUserInfo implements Serializable {
             private String nickname;
             private String avatar;
         }

BaseModule/src/main/java/com/xscm/moduleutil/bean/UserResultResp.java

@@ -1,5 +1,7 @@
 package com.xscm.moduleutil.bean;
 
+import java.util.List;
+
 import lombok.Data;
 
 @Data
@@ -9,8 +11,9 @@ public class UserResultResp {
     private String user_id;
     private String user_code;
     private String nickname;
-    private String head_picture;
+    private String avatar;
-    private String sex;
+    private int sex;
+    private List<String> icon;
     private String follow;
     private String fans_count;
     private String online_text;

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

@@ -72,23 +72,26 @@ 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;
@@ -104,24 +107,49 @@ 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 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;
 
+    /// 被签约者提示弹窗
+    public static final int QXRoomMessageTypeSignTipText = 1094;
     private RoomMessageEvent emMessage;
 
     private int custom = 0;

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

@@ -40,6 +40,7 @@ public class RoomAuction implements Serializable {
         private String nobility_image;//贵族图标
         private String nickname_color;//昵称颜色
         private String mic_cycle;//麦圈
+        private int is_online=1;//是否在线 : 1在线 2离线
     }
 
     @Data

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

@@ -75,7 +75,7 @@ public class RoomBean implements Serializable {
     private String room_name;//房间名称
     private String room_cover;//房间封面
     private String room_intro;//房间公告
-    private String type_id;//房间类型 1:点唱(pk) 2：拍卖（真爱拍小黑屋） 3/4：交友 6：小黑屋  7:互娱 8：交友
+    private String type_id;//房间类型 1:点唱(pk) 2：拍卖（真爱拍小黑屋） 3/4：交友 6：小黑屋  7:互娱 8：交友 10:签约
     private String type_name;//房间类型名称
     private String user_id;//房主id
     private String label_id;//类型id 2:ktv type:1/3/4/8

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

@@ -6,6 +6,9 @@ import java.io.Serializable;
 import java.util.List;
 
 import com.xscm.moduleutil.bean.NobilitDeatils;
+import com.xscm.moduleutil.bean.SignInfo;
+import com.xscm.moduleutil.bean.SingerInfo;
+
 import lombok.Data;
 
 /**
@@ -34,6 +37,11 @@ public class RoomInfoResp implements Serializable {
     private int hour_ranking_open;//1:开启 0：关闭
     private NobilitDeatils.NobilityInfo nobility_info;
 
+    private SingerInfo singer_info;
+    private SignInfo sign_info;
+
+    private String room_id="";
+    private String msg="";
 
     //弹出麦位操作弹出
     public boolean isWheatManager() {

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

@@ -1,12 +1,14 @@
 package com.xscm.moduleutil.bean.room;
 
+import java.io.Serializable;
 import java.util.List;
 
 import lombok.Data;
 
 @Data
-public class RoomOnline  {
+public class RoomOnline implements Serializable {
 
     private List<RoomOnlineBean> on_pit;//麦上用户
     private List<RoomOnlineBean> off_pit;//麦下用户
+    private int count;//在线人数
 }

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

@@ -2,6 +2,7 @@ package com.xscm.moduleutil.bean.room;
 
 import com.chad.library.adapter.base.entity.MultiItemEntity;
 
+import java.io.Serializable;
 import java.util.List;
 
 import lombok.Data;
@@ -12,7 +13,7 @@ import lombok.Data;
  * @description: 房间在线列表
  */
 @Data
-public class RoomOnlineBean implements MultiItemEntity {
+public class RoomOnlineBean implements MultiItemEntity, Serializable {
     private int itemViewType;
     private String typeNames;
     private int user_id;

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

@@ -6,7 +6,7 @@ import java.io.Serializable;
 import lombok.Data;
 
 @Data
-public class RoomPitBean implements Serializable {
+public class RoomPitBean implements Serializable ,Cloneable{
 
 
     /**
@@ -37,7 +37,7 @@ public class RoomPitBean implements Serializable {
     }
 
     private String id;//id
-    private String pit_number = "";//麦位号
+    private String pit_number="";//麦位号
     private String state;//麦位状态 正常 ，1封麦；3禁麦
     private int is_lock;//0未锁麦 1锁麦
     private int is_mute;//0未禁麦 1禁麦
@@ -64,7 +64,7 @@ public class RoomPitBean implements Serializable {
     private String dress_picture;
     private RankInfo rank_info;
     private int ball_state;//1开球0未开球
-    private int is_online;//是否在线 : 1在线 2离线
+    private int is_online=1;//是否在线 : 1在线 2离线
     private String to_pit_number;
     private boolean is_pk;//是否是在pk模式中
     private boolean isMute;//是否打开麦圈
@@ -77,4 +77,17 @@ public class RoomPitBean implements Serializable {
     private String nickname_color;//昵称颜色
     private String mic_cycle;//麦圈
 
+
+    private boolean occupied;
+    private boolean imageType;//是否是演唱者
+
+    public RoomPitBean clone(){
+        try {
+            return (RoomPitBean)super.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
 }

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

@@ -16,12 +16,14 @@ public class RoomSettingBean implements MultiItemEntity {
     public static final int QXRoomSettingTypeRoomTypeBoy = 12;
     /// 女神房
     public static final int QXRoomSettingTypeRoomTypeGirl = 13;
-    ///交友 房
+    /// 交友 房
     public static final int QXRoomSettingTypeRoomTypeJiaoy = 27;
     //互娱
     public static final int QXRoomSettingTypeRoomTypeHUYU = 28;
     //练歌房
     public static final int QXRoomSettingTypeRoomTypeLianG = 31;
+    //签约
+    public static final int QXRoomSettingTypeRoomTypeSIGNCONTRACT = 32;
 
     /// 常用工具
     /// 房间补贴
@@ -70,7 +72,7 @@ public class RoomSettingBean implements MultiItemEntity {
     private boolean select;//是否选中
 
 
-    public RoomSettingBean(String name, String icon, String selectName, String selectIcon, int type, int read, boolean isSelected, boolean status,boolean select) {
+    public RoomSettingBean(String name, String icon, String selectName, String selectIcon, int type, int read, boolean isSelected, boolean status, boolean select) {
         this.name = name;
         this.icon = icon;
         this.selectName = selectName;
@@ -86,6 +88,7 @@ public class RoomSettingBean implements MultiItemEntity {
     public int getItemType() {
         return itemType;
     }
+
     public void updateItemType() {
         if (type == -1) { // 特殊值表示标题
             this.itemType = ITEM_TYPE_DEFAULT;

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

@@ -28,7 +28,7 @@ public class RoomUserBean implements Serializable {
     private String avatar;//用户头像
     private String dress;//头像装扮
     private int is_room_owner;//是否是房主，1是；0不是
-    private int pit_number;//麦位号，如果在麦位上就返回值
+    private int pit_number = 0;//麦位号，如果在麦位上就返回值
     private String state;//麦位状态，如果在麦位撒好难过就有返回值，正常；1：封麦；3禁麦
     private String count_down;//麦位倒计时，在麦位上就有返回值，禁麦倒计时
     private int is_collect;//是否收藏，1是；0没有

BaseModule/src/main/java/com/xscm/moduleutil/bean/zhuangb/ZhuangBanShangChengBean.java

@@ -15,11 +15,13 @@ public class ZhuangBanShangChengBean {
     private String is_perpetual;
     private String special_num ;//靓号
     private String title ;//装扮名称
-    private String type ;//类型，顶部的头部选择
+    private String type="" ;//类型，顶部的头部选择
     private String remaining_day ;//价格
     private String base_image ;//显示图片
     private String play_image;//播放图像
     private boolean is_select = false;
+    private int num ;//数量
+    private String ext_value="" ;//这是使用降身卡的时候，返回的参数，对应的是降身卡的前面，类似10%
 
     public boolean isIs_select() {
         return is_select;

BaseModule/src/main/java/com/xscm/moduleutil/dialog/BaseCpDialog.java

@@ -0,0 +1,160 @@
+package com.xscm.moduleutil.dialog;
+
+import android.annotation.SuppressLint;
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.os.CountDownTimer;
+import android.view.Gravity;
+import android.view.View;
+import android.view.Window;
+import android.widget.Button;
+import android.widget.TextView;
+
+import androidx.constraintlayout.widget.ConstraintLayout;
+
+import com.xscm.moduleutil.R;
+import com.xscm.moduleutil.color.ThemeableDrawableUtils;
+import com.xscm.moduleutil.utils.ColorManager;
+
+public class BaseCpDialog extends Dialog {
+
+    private String title;
+    private String message;
+    private String positiveButtonText;
+    private String negativeButtonText;
+    private View.OnClickListener positiveButtonClickListener;
+    private View.OnClickListener negativeButtonClickListener;
+    private boolean isCountdownEnabled = false; // 是否启用倒计时
+    private int countdownSeconds = 0; // 倒计时秒数
+    private CountDownTimer countDownTimer; // 倒计时对象
+
+
+    public BaseCpDialog(Context context, String title, String message,
+                         String positiveButtonText, String negativeButtonText,
+                         View.OnClickListener positiveButtonClickListener,
+                         View.OnClickListener negativeButtonClickListener,
+                         boolean isCountdownEnabled, int countdownSeconds) {
+        super(context);
+        this.title = title;
+        this.message = message;
+        this.positiveButtonText = positiveButtonText;
+        this.negativeButtonText = negativeButtonText;
+        this.positiveButtonClickListener = positiveButtonClickListener;
+        this.negativeButtonClickListener = negativeButtonClickListener;
+        this.isCountdownEnabled = isCountdownEnabled;
+        this.countdownSeconds = countdownSeconds;
+    }
+
+    private void init() {
+        Window window = getWindow();
+        if (window != null) {
+            window.setGravity(Gravity.CENTER); // 居中显示
+            window.setBackgroundDrawableResource(R.drawable.bg_r16_fff); // 透明背景
+        }
+    }
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.dialog_confirm);
+        init();
+        // 动态设置背景
+//        getWindow().setBackgroundDrawableResource(R.drawable.bg_r16_fff);
+
+        // 初始化视图
+        TextView tvTitle = findViewById(R.id.tv_title);
+        TextView tvMessage = findViewById(R.id.tv_message);
+        Button btnPositive = findViewById(R.id.btn_positive);
+        Button btnNegative = findViewById(R.id.btn_negative);
+        @SuppressLint({"MissingInflatedId", "LocalSuppress"})
+        ConstraintLayout rootView =(ConstraintLayout) findViewById(R.id.root_view);
+
+        // 设置文本
+        tvTitle.setText(title);
+        tvMessage.setText(message);
+        btnPositive.setText(positiveButtonText);
+        btnNegative.setText(negativeButtonText);
+
+        // 设置点击监听器
+        btnPositive.setOnClickListener(v -> {
+            isCountdownCancelled = true; // 标记倒计时被取消
+            if (countDownTimer != null) {
+                countDownTimer.cancel(); // 取消倒计时
+                countDownTimer = null;
+            }
+            if (positiveButtonClickListener != null) {
+                positiveButtonClickListener.onClick(v);
+            }
+            dismiss();
+        });
+
+        // 判断是否需要显示取消按钮
+        if (negativeButtonText != null && !negativeButtonText.isEmpty()) {
+            btnNegative.setText(negativeButtonText);
+            btnNegative.setVisibility(View.VISIBLE);
+
+            btnNegative.setOnClickListener(v -> {
+                if (negativeButtonClickListener != null) {
+                    negativeButtonClickListener.onClick(v);
+                }
+                dismiss();
+            });
+
+            // 倒计时逻辑
+            if (isCountdownEnabled && countdownSeconds > 0) {
+                startCountdown(btnNegative);
+            }
+        } else {
+            // 隐藏取消按钮
+            btnNegative.setVisibility(View.GONE);
+        }
+        // 倒计时逻辑
+        if (isCountdownEnabled && countdownSeconds > 0) {
+            startCountdown(btnNegative);
+        }
+
+        ThemeableDrawableUtils.setThemeableRoundedBackground(btnPositive,  ColorManager.getInstance().getPrimaryColorInt(), 53);
+        btnPositive.setTextColor(ColorManager.getInstance().getButtonColorInt());
+
+        // 找到根布局并应用动画
+
+//        if (rootView != null) {
+//            Animation slideDown = AnimationUtils.loadAnimation(context, R.anim.slide_down);
+//            Animation shake = AnimationUtils.loadAnimation(context, R.anim.shake);
+//
+//            rootView.startAnimation(slideDown);
+//            rootView.startAnimation(shake);
+//        }
+    }
+    private boolean isCountdownCancelled = false; // 添加标志位
+    private void startCountdown(Button btnNegative) {
+        countDownTimer = new CountDownTimer(countdownSeconds * 1000L, 1000) {
+            @Override
+            public void onTick(long millisUntilFinished) {
+                int secondsLeft = (int) (millisUntilFinished / 1000);
+                btnNegative.setText(negativeButtonText + " (" + secondsLeft + "s)");
+            }
+
+            @Override
+            public void onFinish() {
+                // 检查是否被主动取消
+                if (!isCountdownCancelled) {
+                    btnNegative.setText(negativeButtonText);
+                    if (negativeButtonClickListener != null) {
+                        negativeButtonClickListener.onClick(btnNegative); // 自动触发取消
+                    }
+                    dismiss();
+                }
+            }
+        }.start();
+    }
+    @Override
+    public void dismiss() {
+        if (countDownTimer != null) {
+            countDownTimer.cancel(); // 取消倒计时
+            countDownTimer = null;
+        }
+        super.dismiss();
+    }
+
+}

BaseModule/src/main/java/com/xscm/moduleutil/dialog/ConfirmDialog.java

@@ -1,6 +1,7 @@
 package com.xscm.moduleutil.dialog;
 
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
@@ -9,6 +10,7 @@ import android.view.Gravity;
 import android.view.View;
 import android.view.Window;
 import android.widget.Button;
+import android.text.SpannableString;
 import android.widget.TextView;
 
 import androidx.constraintlayout.widget.ConstraintLayout;
@@ -26,6 +28,7 @@ public class ConfirmDialog extends Dialog {
 
     private String title;
     private String message;
+    private SpannableString spannableMessage;
     private String positiveButtonText;
     private String negativeButtonText;
     private View.OnClickListener positiveButtonClickListener;
@@ -34,6 +37,7 @@ public class ConfirmDialog extends Dialog {
     private int countdownSeconds = 0; // 倒计时秒数
     private CountDownTimer countDownTimer; // 倒计时对象
 
+    private Context context;
 
     public ConfirmDialog(Context context, String title, String message,
                          String positiveButtonText, String negativeButtonText,
@@ -41,6 +45,7 @@ public class ConfirmDialog extends Dialog {
                          View.OnClickListener negativeButtonClickListener,
                          boolean isCountdownEnabled, int countdownSeconds) {
         super(context);
+        this.context = context;
         this.title = title;
         this.message = message;
         this.positiveButtonText = positiveButtonText;
@@ -50,6 +55,24 @@ public class ConfirmDialog extends Dialog {
         this.isCountdownEnabled = isCountdownEnabled;
         this.countdownSeconds = countdownSeconds;
     }
+    
+    // 新增构造函数，支持SpannableString
+    public ConfirmDialog(Context context, String title, SpannableString spannableMessage,
+                         String positiveButtonText, String negativeButtonText,
+                         View.OnClickListener positiveButtonClickListener,
+                         View.OnClickListener negativeButtonClickListener,
+                         boolean isCountdownEnabled, int countdownSeconds) {
+        super(context);
+        this.context = context;
+        this.title = title;
+        this.spannableMessage = spannableMessage;
+        this.positiveButtonText = positiveButtonText;
+        this.negativeButtonText = negativeButtonText;
+        this.positiveButtonClickListener = positiveButtonClickListener;
+        this.negativeButtonClickListener = negativeButtonClickListener;
+        this.isCountdownEnabled = isCountdownEnabled;
+        this.countdownSeconds = countdownSeconds;
+    }
 
     private void init() {
         Window window = getWindow();
@@ -76,7 +99,12 @@ public class ConfirmDialog extends Dialog {
 
         // 设置文本
         tvTitle.setText(title);
-        tvMessage.setText(message);
+        // 根据是否有spannableMessage来设置不同的文本
+        if (spannableMessage != null) {
+            tvMessage.setText(spannableMessage);
+        } else {
+            tvMessage.setText(message);
+        }
         btnPositive.setText(positiveButtonText);
         btnNegative.setText(negativeButtonText);
 
@@ -104,15 +132,19 @@ public class ConfirmDialog extends Dialog {
                 }
                 dismiss();
             });
-
-            // 倒计时逻辑
-            if (isCountdownEnabled && countdownSeconds > 0) {
-                startCountdown(btnNegative);
-            }
         } else {
             // 隐藏取消按钮
             btnNegative.setVisibility(View.GONE);
         }
+
+        //判断是否需要显示确认按钮
+        if (positiveButtonText != null && !positiveButtonText.isEmpty()) {
+            btnPositive.setText(positiveButtonText);
+            btnPositive.setVisibility(View.VISIBLE);
+        }else {
+            // 隐藏确认按钮
+            btnPositive.setVisibility(View.GONE);
+        }
         // 倒计时逻辑
         if (isCountdownEnabled && countdownSeconds > 0) {
             startCountdown(btnNegative);
@@ -121,15 +153,6 @@ public class ConfirmDialog extends Dialog {
         ThemeableDrawableUtils.setThemeableRoundedBackground(btnPositive,  ColorManager.getInstance().getPrimaryColorInt(), 53);
         btnPositive.setTextColor(ColorManager.getInstance().getButtonColorInt());
 
-        // 找到根布局并应用动画
-
-//        if (rootView != null) {
-//            Animation slideDown = AnimationUtils.loadAnimation(context, R.anim.slide_down);
-//            Animation shake = AnimationUtils.loadAnimation(context, R.anim.shake);
-//
-//            rootView.startAnimation(slideDown);
-//            rootView.startAnimation(shake);
-//        }
     }
     private boolean isCountdownCancelled = false; // 添加标志位
     private void startCountdown(Button btnNegative) {
@@ -159,6 +182,12 @@ public class ConfirmDialog extends Dialog {
             countDownTimer.cancel(); // 取消倒计时
             countDownTimer = null;
         }
+        if (context instanceof Activity) {
+            Activity activity = (Activity) context;
+            if (activity.isFinishing() || activity.isDestroyed()) {
+                return; // Don't try to dismiss if activity is gone
+            }
+        }
         super.dismiss();
     }
 }

BaseModule/src/main/java/com/xscm/moduleutil/dialog/InviteDialog.java

@@ -1,42 +0,0 @@
-package com.xscm.moduleutil.dialog;
-
-import android.content.Context;
-import android.view.Window;
-import android.view.WindowManager;
-
-import androidx.annotation.NonNull;
-
-import com.blankj.utilcode.util.ScreenUtils;
-import com.xscm.moduleutil.R;
-import com.xscm.moduleutil.databinding.DialogInviteBinding;
-import com.xscm.moduleutil.widget.dialog.BaseDialog;
-/**
- *@author lxj
- *@data  2025年5月14日
- *@description: 房间邀请弹窗
- */
-public class InviteDialog extends BaseDialog<DialogInviteBinding> {
-    public InviteDialog(@NonNull Context context) {
-        super(context);
-    }
-
-    @Override
-    public int getLayoutId() {
-        return R.layout.dialog_invite;
-    }
-
-    @Override
-    public void initView() {
-        setCancelable(false);
-        setCanceledOnTouchOutside(false);
-        Window window = getWindow();
-        window.setLayout((int) (ScreenUtils.getScreenWidth() * 315.f / 375), WindowManager.LayoutParams.WRAP_CONTENT);
-        mBinding.ivClose.setOnClickListener(v -> dismiss());
-
-    }
-
-    @Override
-    public void initData() {
-
-    }
-}

BaseModule/src/main/java/com/xscm/moduleutil/dialog/RechargeDialogFragment.java

@@ -25,9 +25,11 @@ import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.AppPay;
 import com.xscm.moduleutil.bean.BindType;
 import com.xscm.moduleutil.bean.RechargeBean;
+import com.xscm.moduleutil.color.ThemeableDrawableUtils;
 import com.xscm.moduleutil.databinding.FragmentRechargeDialogBinding;
 import com.xscm.moduleutil.presenter.RechargeDialogContacts;
 import com.xscm.moduleutil.presenter.RechargeDialogPresenter;
+import com.xscm.moduleutil.utils.ColorManager;
 import com.xscm.moduleutil.utils.SpUtil;
 import com.xscm.moduleutil.widget.PaymentUtil;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
@@ -142,6 +144,9 @@ public class RechargeDialogFragment extends BaseMvpDialogFragment<RechargeDialog
         }else{
             mBinding.r4.setVisibility(View.GONE);
         }
+
+        ThemeableDrawableUtils.setThemeableRoundedBackground(mBinding.tvPayment, ColorManager.getInstance().getPrimaryColorInt(), 53);
+        mBinding.tvPayment.setTextColor(ColorManager.getInstance().getButtonColorInt());
     }
 
     @Override

BaseModule/src/main/java/com/xscm/moduleutil/enumType/QXRoomSeatViewType.java

@@ -17,8 +17,15 @@ public enum QXRoomSeatViewType {
      * 拍卖麦位
      */
     AUCTION(2, "拍卖麦位"),
+    /**
+     * 点唱
+     */
+    JUKEBOX(9,"点唱麦位"),
 
-
+    /**
+     * 签约
+     */
+    SIGNCONTRACT(10,"签约"),
 
     /**
      * 小黑屋麦位
@@ -30,6 +37,8 @@ public enum QXRoomSeatViewType {
      */
     FRIEND(7, "交友房麦位");
 
+
+
     private final int value;
     private final String description;
 

BaseModule/src/main/java/com/xscm/moduleutil/enumType/RoomType.kt

@@ -14,7 +14,10 @@ enum class RoomType(
     AUCTION("拍卖（真爱拍小黑屋）", 2),
     DATING("交友", 1,3, 4, 8),  // 1、3、4、8 均对应交友
     BLACK_ROOM("小黑屋", 6),
-    MUTUAL_ENTERTAINMENT("互娱", 7);
+    JUKEBOX("点唱", 9),
+    MUTUAL_ENTERTAINMENT("互娱", 7),
+    SIGN_CONTRACT("签约", 10);
+
 
     companion object {
         /**

BaseModule/src/main/java/com/xscm/moduleutil/event/RoomGiftGiveEvent.java

@@ -31,6 +31,4 @@ public class RoomGiftGiveEvent  extends BaseEvent {
         this.heart_id = heart_id;
         this.auction_id = auction_id;
     }
-
-
 }

BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java

@@ -34,7 +34,8 @@ public interface ApiServer {
 
     @FormUrlEncoded
     @POST(Constants.ROOM_HOUR_BEAN)
-    Call<BaseModel<RoomHourBean>> getRoomHourRanking(@Field("page") String page,@Field("page_limit")String page_limit);
+    Call<BaseModel<RoomHourBean>> getRoomHourRanking(@Field("page") String page, @Field("page_limit") String page_limit);
+
     @FormUrlEncoded  //手机换绑
     @POST(Constants.MODIFY_MOBILE)
     Call<BaseModel<String>> mobileView(@Field("mobile") String mobile, @Field("new_mobile") String new_mobile, @Field("sms_code") String sms_code);
@@ -43,7 +44,7 @@ public interface ApiServer {
     Call<BaseModel<List<Emotion>>> upEmotion();
 
     @GET(Constants.GET_EMOTION_DEATILS)
-    Call<BaseModel<List<EmotionDeatils>>> getEmotionDeatils(@Query("type_id") String type_id,@Query("pid") String pid);
+    Call<BaseModel<List<EmotionDeatils>>> getEmotionDeatils(@Query("type_id") String type_id, @Query("pid") String pid);
 
     @FormUrlEncoded  //手机绑定
     @POST(Constants.BIND_MOBILE)
@@ -51,7 +52,7 @@ public interface ApiServer {
 
     @FormUrlEncoded
     @POST(Constants.USER_ROOM_BACK)
-    Call<ResponseBody> userRoomBack(@Field("room_id")String room_id,@Field("type")String type);
+    Call<ResponseBody> userRoomBack(@Field("room_id") String room_id, @Field("type") String type);
 
     @FormUrlEncoded
     @POST(Constants.USER_LOGIN)
@@ -79,7 +80,7 @@ public interface ApiServer {
 
     @FormUrlEncoded
     @POST(Constants.dailyTasksReceive)
-    Call<ResponseBody> dailyTasksReceive(@Field("task_id") String task_id);
+    Call<ResponseBody> dailyTasksReceive(@Field("task_id") String task_id,@Field("student_id") String student_id);
 
     @FormUrlEncoded
     @POST(Constants.dailyTasksComplete)
@@ -125,9 +126,53 @@ public interface ApiServer {
     @POST(Constants.POST_MESSAGE_LIST)
     Call<BaseModel<List<NewsMessageList>>> getMessagetitle(@Field("type") String type, @Field("page") String page, @Field("page_limit") String page_limit);
 
+    @FormUrlEncoded
+    @POST(Constants.POST_INVITE)
+    Call<BaseModel<String>> postInvite(@Field("apply_id") String apply_id, @Field("type") String type);
+
     @GET(Constants.GET_TEMP_KEY)
     Call<BaseModel<TempKeyBean>> getTempKey();
 
+    @FormUrlEncoded
+    @POST(Constants.POST_SINGER_AUTH)
+    Call<BaseModel<String>> singerAuth(@Field("song") String song);
+
+    @FormUrlEncoded
+    @POST(Constants.POST_GET_SONG)
+    Call<BaseModel<SongPlaylist>> getSong(@Field("user_id") String user_id, @Field("room_id") String room_id, @Field("page") String page, @Field("page_limit") String page_limit);
+
+    @FormUrlEncoded
+    @POST(Constants.POST_SINGER_SONG_CUT)
+    Call<BaseModel<String>> singerSongCut(@Field("id") String id);
+
+    @FormUrlEncoded
+    @POST(Constants.POST_SINGER_SONG_TOP)
+    Call<BaseModel<String>> singerSongTop(@Field("id") String id);
+
+    @FormUrlEncoded
+    @POST(Constants.POST_SINGER_SONG_COUNT)
+    Call<BaseModel<SingerSongCount>> singerSongCount(@Field("room_id") String room_id);
+
+    @FormUrlEncoded
+    @POST(Constants.POST_SINGER_SONG)
+    Call<BaseModel<String>> singerSong(@Field("song_id") String song_id, @Field("room_id") String room_id);
+
+    @FormUrlEncoded
+    @POST(Constants.POST_SINGER_SONG_LIST)
+    Call<BaseModel<SongPlaylist>> singerSongList(@Field("room_id") String room_id, @Field("type") String type, @Field("page") String page, @Field("page_limit") String page_limit);
+
+    @FormUrlEncoded
+    @POST(Constants.POST_SINGER_DELETE_SONG)
+    Call<BaseModel<String>> deleteSong(@Field("id") String song_id);
+
+    @FormUrlEncoded
+    @POST(Constants.POST_SINGER_ADD_SONG)
+    Call<BaseModel<String>> singerAddSong(@Field("song_name") String song_name, @Field("gift_id") String gift_id, @Field("gift_num") String gift_num);
+
+    @FormUrlEncoded
+    @POST(Constants.POST_SINGER_UPDATE_SONG)
+    Call<BaseModel<String>> singerUpdateSong(@Field("id") String is, @Field("song_name") String song_name, @Field("gift_id") String gift_id, @Field("gift_num") String gift_num);
+
     @FormUrlEncoded
     @POST(Constants.POST_ROOM_RANK)
     Call<BaseModel<List<CharmRankingResp>>> getRoomRank(@Field("room_id") String room_id, @Field("type") String type, @Field("time_type") String time_type, @Field("page") String page, @Field("page_limit") String page_limit);
@@ -290,9 +335,10 @@ public interface ApiServer {
 
     //获取礼物列表
     @GET(Constants.GIFT_LIST)
-    Call<BaseModel<List<RoonGiftModel>>> getGiftList(@Query("label") int label,@Query("room_id")String room_id);
+    Call<BaseModel<List<RoonGiftModel>>> getGiftList(@Query("label") int label, @Query("room_id") String room_id);
 
-    @GET(Constants.TOPIC_LIST)//获取话题
+    @GET(Constants.TOPIC_LIST)
+//获取话题
     Call<BaseModel<List<HeatedBean>>> topicList(@Query("page") String page, @Query("page_limit") String page_limit);
 
     @FormUrlEncoded
@@ -345,16 +391,23 @@ public interface ApiServer {
     Call<BaseModel<String>> commentZone(@Field("id") String id, @Field("content") String content, @Field("pid") String pid, @Field("reply_to") String reply_to);
 
 
+    @FormUrlEncoded
+    @POST(Constants.POST_FRIEND_LIST)
+    Call<BaseModel<RelationBean>> getFriendList(@Field("user_id") String user_id, @Field("page") String page, @Field("page_limit") String page_limit);
+
     @GET(Constants.GET_MY_CP_ROOM_LIST)
     Call<BaseModel<List<MyCpRoom>>> myCpRoom();
 
+    @GET(Constants.CHECK_CREATE_ROOM)
+    Call<BaseModel<String>> checkCreateRoom();
+
     @FormUrlEncoded
     @POST(Constants.CLEAR_LOGIN_INFO)
     Call<BaseModel<String>> clearLoginInfo(@Field("token") String token);
 
     @FormUrlEncoded
     @POST(Constants.CANCEL)
-    Call<BaseModel<String>> cancel(@Field("token") String token);
+    Call<BaseModel<String>> cancel(@Field("token") String token,@Field("sms_code")String sms_code);
 
     @FormUrlEncoded
     @POST(Constants.POST_MODIFY_HIDE_STATUS)
@@ -445,6 +498,10 @@ public interface ApiServer {
     @POST(Constants.JOIN_ROOM)
     Call<BaseModel<RoomInfoResp>> roomGetIn(@Field("room_id") String roomId, @Field("password") String password);
 
+    @FormUrlEncoded
+    @POST(Constants.TASK_JUMP_ROOM)
+    Call<BaseModel<String>> taskJumpRoomId(@Field("task_id") String taskId);
+
     @FormUrlEncoded
     @POST(Constants.DELETE_ALBUM_IMAGE)
     Call<BaseModel<String>> deleteAlbumImage(@Field("id") String id);
@@ -475,16 +532,24 @@ public interface ApiServer {
 
     @FormUrlEncoded
     @POST(Constants.GET_ROOM_GIFT)
-    Call<BaseModel<String>> roomGift(@Field("room_id") String room_id, @Field("gift_id") String gift_id, @Field("gift_num") String num, @Field("to_uid") String to_uid, @Field("type") String gift_type, @Field("pit_number") String pit_number, @Field("heart_id") String heat_id);
+    Call<BaseModel<RoomGiftData>> roomGift(@Field("room_id") String room_id, @Field("gift_id") String gift_id, @Field("gift_num") String num, @Field("to_uid") String to_uid, @Field("type") String gift_type, @Field("pit_number") String pit_number, @Field("heart_id") String heat_id);
+
+    @FormUrlEncoded
+    @POST(Constants.POST_CP_GIVE_GIFT)
+    Call<BaseModel<RoomGiftData>> cpGiveGift(@Field("user_id") String user_id, @Field("gift_id") String gift_id, @Field("room_id") String room_id);
 
     @GET(Constants.GET_FIRST_CHARGE_GIFT)
     Call<BaseModel<FirstChargeGiftBean>> firstChargeGift();
+
     @GET(Constants.GET_NEW_CHARGE_GIFT)
     Call<BaseModel<FirstChargeGiftBean>> getNewChargeGift();
 
     @GET(Constants.GET_ACTIVITIES_PERMISSION)
     Call<BaseModel<ActivitiesPermission>> activitiesPermission();
 
+    @GET(Constants.GET_INDEX_RECOMMEND_ROOM)
+    Call<BaseModel<IndexRecommendRoom>> index_recommend_room();
+
     @GET(Constants.GET_DAY_DROP_GIFT)
     Call<BaseModel<HeavenGiftBean>> getDayDropGift();
 
@@ -494,8 +559,8 @@ public interface ApiServer {
     @FormUrlEncoded
     @POST(Constants.REDPACKET_CREATE)
     Call<ResponseBody> redPacketCreate(@Field("type") int type, @Field("password") String password, @Field("coin_type") int coin_type, @Field("total_amount") String total_amount,
-                                                   @Field("total_count")String total_count, @Field("conditions") String conditions, @Field("countdown") String countdown, @Field("room_id") String room_id,
+                                       @Field("total_count") String total_count, @Field("conditions") String conditions, @Field("countdown") String countdown, @Field("room_id") String room_id,
-                                       @Field("remark") String  remark);
+                                       @Field("remark") String remark);
 
     @GET(Constants.ROOM_REDPACKET)
     Call<BaseModel<List<RedPacketInfo>>> roomRedPackets(@Query("room_id") String roomId);
@@ -540,7 +605,7 @@ public interface ApiServer {
 
     @FormUrlEncoded
     @POST(Constants.POST_SONG_LIST)
-    Call<BaseModel<List<MusicSongBean>>> songList(@Field("room_id") String room_id);
+    Call<BaseModel<List<MusicSongBean>>> songList(@Field("room_id") String room_id,@Field("page")String page);
 
     @FormUrlEncoded
     @POST(Constants.APPLY_PIT)
@@ -562,8 +627,9 @@ public interface ApiServer {
     @POST(Constants.DELAY)
     Call<BaseModel<String>> delay(@Field("friend_id") String friend_id, @Field("room_id") String room_id, @Field("delay_times") String delay_times);
 
+    @FormUrlEncoded
     @POST(Constants.POST_KEEP_XINTIAO)
-    Call<ResponseBody> keepXintiao();
+    Call<ResponseBody> keepXintiao(@Field("room_id") String room_id);
 
     @FormUrlEncoded
     @POST(Constants.DOWN_PIT)
@@ -710,6 +776,10 @@ public interface ApiServer {
     @POST(Constants.POST_QUIT_ROOM)
     Call<ResponseBody> quitRoom(@Field("room_id") String room_id, @Field("user_id") String user_id);
 
+    @FormUrlEncoded
+    @POST(Constants.POST_FRIEND_LIST_MORE)
+    Call<BaseModel<List<RelationshipBean>>> getFriendListMore(@Field("user_id") String user_id, @Field("relation_id") String relation_id);
+
     @FormUrlEncoded
     @POST(Constants.POST_RELATION_CARD)
     Call<BaseModel<RelationCardBean>> relationCard(@Field("user_id") String user_id);
@@ -745,17 +815,17 @@ public interface ApiServer {
 
     @FormUrlEncoded
     @POST(Constants.POST_DRAW_GIFT_LIST)
-    Call<BaseModel<BlindReslutBean>> drawGiftList(@Field("gift_bag_id") String gift_bag_id, @Field("gift_user_ids") String gift_user_ids,@Field("room_id")String room_id,@Field("num")String num,@Field("heart_id") String heart_id,@Field("auction_id") String auction_id);
+    Call<BaseModel<BlindReslutBean>> drawGiftList(@Field("gift_bag_id") String gift_bag_id, @Field("gift_user_ids") String gift_user_ids, @Field("room_id") String room_id, @Field("num") String num, @Field("heart_id") String heart_id, @Field("auction_id") String auction_id);
 
     @GET(Constants.GET_MY_RECORD)
-    Call<BaseModel<List<GiftBean>>> getMyRecord(@Query("gift_bag_id")String gift_bag_id,@Query("page")String page,@Query("page_size")String page_size);
+    Call<BaseModel<List<GiftBean>>> getMyRecord(@Query("gift_bag_id") String gift_bag_id, @Query("page") String page, @Query("page_size") String page_size);
 
     @GET(Constants.GET_ALL_RECORD)
-    Call<BaseModel<List<GiftBean>>> getAllRecord(@Query("gift_bag_id")String gift_bag_id,@Query("page")String page,@Query("page_size")String page_size);
+    Call<BaseModel<List<GiftBean>>> getAllRecord(@Query("gift_bag_id") String gift_bag_id, @Query("page") String page, @Query("page_size") String page_size);
 
     @FormUrlEncoded
     @POST(Constants.GIFT_SEND)
-    Call<BaseModel<String>> giftSend(@Field("send_id")String send_id);
+    Call<BaseModel<String>> giftSend(@Field("send_id") String send_id);
 
     @GET(Constants.GET_NOBILITY_DETAIL)
     Call<BaseModel<NobilitDeatils>> getNobilityDetail();
@@ -767,10 +837,10 @@ public interface ApiServer {
     Call<BaseModel<NobilityPrice>> getNobilityPrice(@Query("id") String id);
 
     @POST(Constants.POST_SEND_LOG)
-    Call<BaseModel<String>> postSendAppLog(@Query("log_name") String logName,@Query("log_url") String logUrl);
+    Call<BaseModel<String>> postSendAppLog(@Query("log_name") String logName, @Query("log_url") String logUrl);
 
     @GET(Constants.GET_BOX_GIFT_LIST_XLH)
-    Call<BaseModel<BlindBoxBean>> getBoxGiftListXLH( @Query("room_id") String room_id);
+    Call<BaseModel<BlindBoxBean>> getBoxGiftListXLH(@Query("room_id") String room_id);
 
     @FormUrlEncoded
     @POST(Constants.POST_DRAW_GIFT_LIST_XLH)
@@ -779,6 +849,7 @@ public interface ApiServer {
     @FormUrlEncoded
     @POST(Constants.POST_XLH_ALL_RECORD)
     Call<BaseModel<List<GiftBean>>> xlhAllRecord(@Field("room_id") String room_id, @Field("page") String page, @Field("page_size") String page_size);
+
     @FormUrlEncoded
     @POST(Constants.Get_XH_RANking)
     Call<BaseModel<List<GiftBean>>> xlXH_RANking(@Field("room_id") String room_id, @Field("page") String page, @Field("page_size") String page_size);
@@ -788,11 +859,11 @@ public interface ApiServer {
 
     @FormUrlEncoded
     @POST(Constants.POST_GIFT_ALL_CLEAR)
-    Call<BaseModel<String>> getGiftPack(@Field("room_id") String roomId,@Field("to_uid") String user_id,@Field("heart_id") String heart_id,@Field("auction_id") String auction_id);
+    Call<BaseModel<String>> getGiftPack(@Field("room_id") String roomId, @Field("to_uid") String user_id, @Field("heart_id") String heart_id, @Field("auction_id") String auction_id);
 
     @FormUrlEncoded
     @POST(Constants.POST_ROOM_USER_CHARM_LIST)
-    Call<BaseModel<List<RoomUserCharmListBean>>> roomUserCharmList(@Field("room_id") String roomId,@Field("user_id") String user_id);
+    Call<BaseModel<List<RoomUserCharmListBean>>> roomUserCharmList(@Field("room_id") String roomId, @Field("user_id") String user_id);
 
     @GET(Constants.GET_GIFT_PACK_LIST_COUNT)
     Call<BaseModel<GiftPackListCount>> getGiftPackListCount();
@@ -801,4 +872,61 @@ public interface ApiServer {
     @POST(Constants.ROOM_USER_RECONNECT)
     Call<BaseModel<String>> roomUserReconnect(@Field("room_id") String room_id);
 
+    @GET(Constants.GET_CP_ZONE)
+    Call<BaseModel<HeartCpBean>> getCpRoom(@Query("user_id") String userId,@Query("page")String page);
+
+
+    @GET(Constants.POST_MY_FAMILY)
+    Call<BaseModel<MyFamilyBean>> myFamily();
+
+    @GET(Constants.POST_MY_JOIN_FAMILY)
+    Call<BaseModel<MyFamilyBean>> myJoinFamily();
+
+    @FormUrlEncoded
+    @POST(Constants.POST_FAMILY_EARNINGS)
+    Call<BaseModel<List<FamilyEarnings>>> familyEarnings(@Field("user_id") String user_id, @Field("page") int page, @Field("start_time") String start_time, @Field("end_time") String end_time);
+
+    @FormUrlEncoded
+    @POST(Constants.POST_SIGN_START)
+    Call<BaseModel<String>> signStart(@Field("room_id") String room_id, @Field("user_id") String user_id);
+
+    @FormUrlEncoded
+    @POST(Constants.POST_SIGN_END)
+    Call<BaseModel<String>> signEnd(@Field("sign_id") String sign_id);
+
+    @FormUrlEncoded
+    @POST(Constants.POST_SIGN_DELAY)
+    Call<BaseModel<String>> signDelay(@Field("sign_id") String sign_id, @Field("room_id") String room_id);
+
+    @FormUrlEncoded
+    @POST(Constants.POST_SIGN_COIN_LIST)
+    Call<BaseModel<List<String>>> signCoinList(@Field("sign_id") String sign_id);
+    @FormUrlEncoded
+    @POST(Constants.POST_SIGN_COIN)
+    Call<BaseModel<String>> signCoin(@Field("sign_id") String sign_id,@Field("sign_value") String sign_value);
+
+    @GET(Constants.GET_SKILL_LIST)
+    Call<BaseModel<List<String>>> skillList();
+
+    @FormUrlEncoded
+    @POST(Constants.POST_FREE_RE_SIGN)
+    Call<BaseModel<String>> freeReSign(@Field("user_id") String user_id);
+
+    @FormUrlEncoded
+    @POST(Constants.POST_RE_SIGN)
+    Call<BaseModel<String>> reSign(@Field("user_id") String user_id);
+
+    @FormUrlEncoded
+    @POST(Constants.POST_SIGN_REFUSE)
+    Call<BaseModel<String>> signRefuse(@Field("room_id") String room_id);
+
+
+    @GET(Constants.GET_SIGN_IN_LIST)
+    Call<BaseModel<List<SignInData>>> signIn();
+
+    @GET(Constants.POST_DAILY_TASKS_SIGN)
+    Call<BaseModel<String>> postDailyTasksSign();
+
+    @GET(Constants.POST_DAILY_TASKS_SIGN_STATUS)
+    Call<BaseModel<TasksSignStatus>> postDailyTasksSignStatus();
 }

BaseModule/src/main/java/com/xscm/moduleutil/http/BaseModelTypeAdapter.java

@@ -63,8 +63,7 @@ public class BaseModelTypeAdapter<T> extends TypeAdapter<BaseModel<T>> {
                             model.setData(null);
                         } else {
                             // 如果 data 是字符串类型但不是 "null"，可根据业务决定是否抛异常或处理
-                            reader.skipValue();
+                            model.setData((T)value);
-                            model.setData(null);
                         }
                     } else {
                         try {

BaseModule/src/main/java/com/xscm/moduleutil/listener/CPListener.kt

@@ -0,0 +1,21 @@
+package com.xscm.moduleutil.listener
+
+import com.xscm.moduleutil.bean.RoomGiftData
+import com.xscm.moduleutil.bean.RoomMessageEvent
+
+/**
+ * 这是cp的监听器，方便在各个模块中调用
+ */
+interface CPListener {
+    /**
+     * 发送CP消息的处理函数
+     * @param gitData 礼物数据信息，包含房间礼物相关的数据
+     */
+    fun onSendCpMsg(gitData: RoomGiftData)
+
+    /**
+     * 接收房间消息事件的处理函数
+     * @param roomMessageEvent 房间消息事件对象，包含消息相关的所有信息
+     */
+    fun onReceiveMsg(roomMessageEvent: RoomMessageEvent)
+}

BaseModule/src/main/java/com/xscm/moduleutil/listener/MessageListenerSingleton.java

@@ -15,7 +15,9 @@ import com.xscm.moduleutil.bean.RoomMessageEvent;
 import com.xscm.moduleutil.bean.room.EMMessageInfo;
 import com.xscm.moduleutil.event.RoomJoinMountModel;
 import com.xscm.moduleutil.event.UnreadCountEvent;
+import com.xscm.moduleutil.http.RetrofitClient;
 import com.xscm.moduleutil.rtc.MusicPlayBean;
+import com.xscm.moduleutil.utils.CustomMsgCode;
 import com.xscm.moduleutil.utils.SpUtil;
 import com.tencent.imsdk.v2.V2TIMAdvancedMsgListener;
 import com.tencent.imsdk.v2.V2TIMCallback;
@@ -34,6 +36,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
@@ -64,6 +67,8 @@ public class MessageListenerSingleton {
     private final Map<String, List<RoomMessageEvent>> cachedMessages = new ConcurrentHashMap<>();
     private final Set<String> joinedRooms = ConcurrentHashMap.newKeySet();
 
+    private OnMsgTaskListener onMsgTaskListener;
+
     //    private boolean listenersAdded = false; // 标记监听器是否已添加
     // 1. 添加新的监听器接口
     public interface PublicScreenMessageListener {
@@ -91,6 +96,7 @@ public class MessageListenerSingleton {
 
     // 同时修改 removePublicScreenMessageListener 方法
     public void removePublicScreenMessageListener(PublicScreenMessageListener listener) {
+        mRoomId = "";
         if (listener == null) {
             return;
         }
@@ -103,6 +109,7 @@ public class MessageListenerSingleton {
             }
         }
     }
+
     // 修改 notify 方法以增加保护
     private void notifyPublicScreenListeners(RoomMessageEvent message) {
         synchronized (publicScreenListeners) {
@@ -201,7 +208,8 @@ public class MessageListenerSingleton {
         if (TextUtils.isEmpty(roomId)) {
             return;
         }
-
+        if (Objects.equals(mRoomId, roomId))
+            return;
         synchronized (groupOperationLock) {
             if (isGroupOperationInProgress) {
                 // 如果有操作正在进行，延迟执行
@@ -212,12 +220,12 @@ public class MessageListenerSingleton {
 
             isGroupOperationInProgress = true;
         }
-
+        mRoomId = roomId;
         new Thread(() -> {
             try {
                 // 先退出当前群组（如果需要）
                 if (groupId != null && !groupId.equals(roomId)) {
-                    LogUtils.d("MessageListener", "开始退出群组: " + groupId   +"____room:"+ roomId);
+                    LogUtils.d("MessageListener", "开始退出群组: " + groupId + "____room:" + roomId);
                     CountDownLatch quitLatch = new CountDownLatch(1);
                     boolean[] quitSuccess = {false};
 
@@ -225,14 +233,14 @@ public class MessageListenerSingleton {
                         V2TIMManager.getInstance().quitGroup("room" + groupId, new V2TIMCallback() {
                             @Override
                             public void onSuccess() {
-                                LogUtils.d("MessageListener", "退出群组成功: " + groupId+"____room:"+ roomId);
+                                LogUtils.d("MessageListener", "退出群组成功: " + groupId + "____room:" + roomId);
                                 quitSuccess[0] = true;
                                 quitLatch.countDown();
                             }
 
                             @Override
                             public void onError(int code, String desc) {
-                                LogUtils.e("MessageListener", "退出群组失败: " + groupId +"____room:"+ roomId + ", code=" + code + ", desc=" + desc);
+                                LogUtils.e("MessageListener", "退出群组失败: " + groupId + "____room:" + roomId + ", code=" + code + ", desc=" + desc);
                                 quitSuccess[0] = false;
                                 quitLatch.countDown();
                             }
@@ -313,7 +321,16 @@ public class MessageListenerSingleton {
                     LogUtils.d("C2C 自定义（信令）消息 " + sender.getNickName());
                     String message = new String(customData, StandardCharsets.UTF_8);
                     RoomMessageEvent event = GsonUtils.fromJson(message, RoomMessageEvent.class);
-                    notifyMessageReceived(event);
+                    if (event.getMsgType() == 130 || event.getMsgType() == 131) {
+//                        EventBus.getDefault().post(event);
+                        RetrofitClient.getInstance().getCpListener().onReceiveMsg(event);
+                    } else if (event.getMsgType() == CustomMsgCode.INSTANCE.getCODE_TASK_APPRENTICE_JOIN_ROOM()) {
+                        if (onMsgTaskListener != null) {
+                            onMsgTaskListener.onMsgTask(event);
+                        }
+                    } else {
+                        notifyMessageReceived(event);
+                    }
                 }
 
                 @Override
@@ -390,14 +407,13 @@ public class MessageListenerSingleton {
                             // 使用默认解析
                             event = GsonUtils.fromJson(message, RoomMessageEvent.class);
                         }
-
+                        LogUtils.e("收到群自定义消息：" + mRoomId + "===" + event);
 //                    event = GsonUtils.fromJson(message, RoomMessageEvent.class);
                     } catch (Exception e) {
                         // 处理 JSON 解析过程中可能出现的异常，例如记录日志
                         LogUtils.e("解析 JSON 数据时出错：" + e.getMessage());
                         return; // 退出方法，避免后续代码执行
                     }
-
                     if (groupID.contains(mRoomId)) {
                         notifyMessageReceived(event);
                     }
@@ -486,7 +502,7 @@ public class MessageListenerSingleton {
 
         if (instance != null) {
             instance.listeners.clear();
-            removeAllListeners();
+//            removeAllListeners();
             isInitialized = false;
             groupId = null;
             LogUtils.e("@@@", "重置成功");
@@ -497,7 +513,7 @@ public class MessageListenerSingleton {
     public static void reset(String roomId) {
         if (instance != null) {
             instance.listeners.clear();
-            removeAllListeners();
+//            removeAllListeners();
             isInitialized = false;
             groupId = null;
 //            instance = null;
@@ -508,7 +524,7 @@ public class MessageListenerSingleton {
 
 
     // 确保监听器已添加
-    private void ensureListenersAdded() {
+    public void ensureListenersAdded() {
         initListeners();
         addAllListeners();
     }
@@ -574,7 +590,56 @@ public class MessageListenerSingleton {
         );
     }
 
-    public void sendCustomC2CMessage(String userId, byte[] binaryData) {
+    // TODO: 2025/11/19 添加发送公共方法，messageType：发送的type；message：发送的内容  userId：发送给谁
+    public void sendCustomC2CMessage(int messageType, String message, String userId) {
+
+        RoomMessageEvent.T t = new RoomMessageEvent.T();
+        t.setFromUserInfo(SpUtil.getUserInfo());
+        t.setText(message);
+        RoomMessageEvent roomMessageEvent = new RoomMessageEvent(messageType, mRoomId, t);
+        String json = com.blankj.utilcode.util.GsonUtils.toJson(roomMessageEvent);
+        // 转换为 byte[]
+        byte[] binaryData = json.getBytes(StandardCharsets.UTF_8);
+
+        // 创建自定义群消息
+        V2TIMMessage v2TIMMessage = V2TIMManager.getMessageManager().createCustomMessage(binaryData);
+        v2TIMMessage.setExcludedFromUnreadCount(true);
+        v2TIMMessage.setExcludedFromContentModeration(true);
+//        v2TIMMessage.setNeedReadReceipt(true);
+//
+//        // 发送消息
+        V2TIMManager.getMessageManager().sendMessage(v2TIMMessage, "u" + userId, null, V2TIMMessage.V2TIM_PRIORITY_HIGH,
+                true,
+                null,
+                sendCallback);
+
+    }
+
+
+    // TODO: 2025/11/19 添加发送公共方法，messageType：发送的type；message：发送的内容  userId：发送给谁
+    public void sendCustomC2CMessage(int messageType, String userId,RoomMessageEvent.T text) {
+        text.setFromUserInfo(SpUtil.getUserInfo());
+        LogUtils.e("发送消息", "messageType:" + messageType + "\nuserId:" + userId + "\ntext:" + text,toString());
+        RoomMessageEvent roomMessageEvent = new RoomMessageEvent(messageType, mRoomId, text);
+        String json = com.blankj.utilcode.util.GsonUtils.toJson(roomMessageEvent);
+        // 转换为 byte[]
+        byte[] binaryData = json.getBytes(StandardCharsets.UTF_8);
+
+        // 创建自定义群消息
+        V2TIMMessage v2TIMMessage = V2TIMManager.getMessageManager().createCustomMessage(binaryData);
+        v2TIMMessage.setExcludedFromUnreadCount(true);
+        v2TIMMessage.setExcludedFromContentModeration(true);
+//        v2TIMMessage.setNeedReadReceipt(true);
+//
+//        // 发送消息
+        V2TIMManager.getMessageManager().sendMessage(v2TIMMessage, "u" + userId, null, V2TIMMessage.V2TIM_PRIORITY_HIGH,
+                true,
+                null,
+                sendCallback);
+
+    }
+
+    public void sendCustomC2CMessage125(String userId, byte[] binaryData) {
         // 创建自定义群消息
         V2TIMMessage v2TIMMessage = V2TIMManager.getMessageManager().createCustomMessage(binaryData);
         v2TIMMessage.setExcludedFromUnreadCount(true);
@@ -612,7 +677,7 @@ public class MessageListenerSingleton {
 //            listener.onMessageReceived(message);
 //        }
 
-        if (message.getMsgType() == 1001 && publicScreenListeners.isEmpty()) {
+        if ((message.getMsgType() == 1001 || message.getMsgType() == 1080) && publicScreenListeners.isEmpty()) {
             cacheMessage(message.getRoomId(), message);
         }
 
@@ -630,4 +695,13 @@ public class MessageListenerSingleton {
     public interface OnMessageReceivedListener {
         void onMessageReceived(RoomMessageEvent message);
     }
+
+
+    public void setOnMsgTaskListener(OnMsgTaskListener listener) {
+        this.onMsgTaskListener = listener;
+    }
+
+    public interface OnMsgTaskListener {
+        void onMsgTask(RoomMessageEvent message);
+    }
 }

BaseModule/src/main/java/com/xscm/moduleutil/presenter/BasePresenter.java

@@ -30,6 +30,10 @@ public abstract class BasePresenter<V extends IView> implements IPresenter {
         mContext = context;
     }
 
+    public BasePresenter() {
+
+    }
+
     private void attachView(V view) {
         MvpRef = new WeakReference<V>(view);
     }

BaseModule/src/main/java/com/xscm/moduleutil/presenter/RewardGiftPresenter.java

@@ -6,10 +6,12 @@ import com.xscm.moduleutil.bean.GiftLabelBean;
 import com.xscm.moduleutil.bean.GiftPackBean;
 import com.xscm.moduleutil.bean.GiftPackListCount;
 import com.xscm.moduleutil.bean.RewardUserBean;
+import com.xscm.moduleutil.bean.RoomGiftData;
 import com.xscm.moduleutil.bean.RoonGiftModel;
 import com.xscm.moduleutil.bean.WalletBean;
 import com.xscm.moduleutil.bean.room.RoomAuction;
 import com.xscm.moduleutil.http.BaseObserver;
+import com.xscm.moduleutil.http.RetrofitClient;
 
 import java.lang.ref.WeakReference;
 import java.util.List;
@@ -26,7 +28,7 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
 
     @Override
     public void getRewardList(String id, int page, int page_limit) {
-        api.getRewardList(id, page, page_limit, new BaseObserver<List<RewardUserBean>>() {
+        RetrofitClient.getInstance().getRewardList(id, page, page_limit, new BaseObserver<List<RewardUserBean>>() {
             @Override
             public void onSubscribe(Disposable d) {
                 addDisposable(d);
@@ -45,7 +47,7 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
 
     @Override
     public void getGiftLabel(String have_hot) {
-        api.getGiftLabel(have_hot, new BaseObserver<List<GiftLabelBean>>() {
+        RetrofitClient.getInstance().getGiftLabel(have_hot, new BaseObserver<List<GiftLabelBean>>() {
             @Override
             public void onSubscribe(Disposable d) {
                 addDisposable(d);
@@ -64,7 +66,7 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
 
     @Override
     public void getGiftList(String id, int type, String roomId) {
-        api.getGiftList(Integer.parseInt(id), roomId, new BaseObserver<List<RoonGiftModel>>() {
+        RetrofitClient.getInstance().getGiftList(Integer.parseInt(id), roomId, new BaseObserver<List<RoonGiftModel>>() {
 
             @Override
             public void onSubscribe(Disposable d) {
@@ -83,7 +85,7 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
 
     @Override
     public void giveGift(String user_id, String gid, String num, String to_uid, String gift_type) {
-        api.giveGift(user_id, gid, num, to_uid, gift_type, new BaseObserver<String>() {
+        RetrofitClient.getInstance().giveGift(user_id, gid, num, to_uid, gift_type, new BaseObserver<String>() {
 
             @Override
             public void onSubscribe(Disposable d) {
@@ -102,7 +104,7 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
 
     @Override
     public void roomGift(String room_id, String gift_id, String gift_num, String to_uid, String type, String pit_number, String heart_id) {
-        api.roomGift(room_id, gift_id, gift_num, to_uid, type, pit_number, heart_id, new BaseObserver<String>() {
+        RetrofitClient.getInstance().roomGift(room_id, gift_id, gift_num, to_uid, type, pit_number, heart_id, new BaseObserver<RoomGiftData>() {
 
             @Override
             public void onSubscribe(Disposable d) {
@@ -110,7 +112,7 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
             }
 
             @Override
-            public void onNext(String s) {
+            public void onNext(RoomGiftData s) {
                 if (MvpRef == null) {
                     MvpRef = new WeakReference<>(mView);
                 }
@@ -121,7 +123,7 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
 
     @Override
     public void wallet() {
-        api.wallet(new BaseObserver<WalletBean>() {
+        RetrofitClient.getInstance().wallet(new BaseObserver<WalletBean>() {
             @Override
             public void onSubscribe(Disposable d) {
                 addDisposable(d);
@@ -139,7 +141,7 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
 
     @Override
     public void reward_zone(String id, String gift_id, String num, String is_pack) {
-        api.reward_zone(id, gift_id, num, is_pack, new BaseObserver<String>() {
+        RetrofitClient.getInstance().reward_zone(id, gift_id, num, is_pack, new BaseObserver<String>() {
 
             @Override
             public void onSubscribe(Disposable d) {
@@ -158,7 +160,7 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
 
     @Override
     public void setRoomApply(String room_id, String gift_id, String gift_price) {
-        api.setRoomApply(room_id, gift_id, gift_price, new BaseObserver<String>() {
+        RetrofitClient.getInstance().setRoomApply(room_id, gift_id, gift_price, new BaseObserver<String>() {
             @Override
             public void onSubscribe(Disposable d) {
                 addDisposable(d);
@@ -176,7 +178,7 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
 
     @Override
     public void roomAuctionJoin(String auction_id, String user_id, String gift_id, String num, String type) {
-        api.roomAuctionJoin(auction_id, user_id, gift_id, num, type, new BaseObserver<RoomAuction.AuctionListBean>() {
+        RetrofitClient.getInstance().roomAuctionJoin(auction_id, user_id, gift_id, num, type, new BaseObserver<RoomAuction.AuctionListBean>() {
             @Override
             public void onSubscribe(Disposable d) {
                 addDisposable(d);
@@ -194,7 +196,7 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
 
     @Override
     public void giftPack() {
-        api.giftPack(new BaseObserver<List<GiftPackBean>>() {
+        RetrofitClient.getInstance().giftPack(new BaseObserver<List<GiftPackBean>>() {
 
             @Override
             public void onSubscribe(Disposable d) {
@@ -216,7 +218,7 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
 
     @Override
     public void getGiftPack(String roomId, String userId, String heart_id, String auction_id) {
-        api.getGiftPack(roomId, userId, heart_id, auction_id, new BaseObserver<String>() {
+        RetrofitClient.getInstance().getGiftPack(roomId, userId, heart_id, auction_id, new BaseObserver<String>() {
             @Override
             public void onSubscribe(Disposable d) {
                 addDisposable(d);
@@ -238,7 +240,7 @@ public class RewardGiftPresenter extends BasePresenter<RewardGiftContacts.View>
 
     @Override
     public void getGiftPackListCount() {
-        api.getGiftPackListCount(new BaseObserver<GiftPackListCount>() {
+        RetrofitClient.getInstance().getGiftPackListCount(new BaseObserver<GiftPackListCount>() {
             @Override
             public void onSubscribe(Disposable d) {
                 addDisposable(d);

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

@@ -1,31 +1,30 @@
 package com.xscm.moduleutil.rtc;
 
 
-import static com.blankj.utilcode.util.SnackbarUtils.getView;
+import static io.agora.rtc2.Constants.NETWORK_TYPE_DISCONNECTED;
+import static io.agora.rtc2.Constants.NETWORK_TYPE_LAN;
+import static io.agora.rtc2.Constants.NETWORK_TYPE_MOBILE_2G;
+import static io.agora.rtc2.Constants.NETWORK_TYPE_MOBILE_3G;
+import static io.agora.rtc2.Constants.NETWORK_TYPE_MOBILE_4G;
+import static io.agora.rtc2.Constants.NETWORK_TYPE_MOBILE_5G;
+import static io.agora.rtc2.Constants.NETWORK_TYPE_UNKNOWN;
+import static io.agora.rtc2.Constants.NETWORK_TYPE_WIFI;
 import static io.agora.rtc2.video.VideoEncoderConfiguration.*;
 import static io.agora.rtc2.video.VideoEncoderConfiguration.FRAME_RATE.FRAME_RATE_FPS_15;
-import static io.agora.rtc2.video.VideoEncoderConfiguration.FRAME_RATE.FRAME_RATE_FPS_30;
 import static io.agora.rtc2.video.VideoEncoderConfiguration.ORIENTATION_MODE.*;
 
 import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.Application;
 import android.content.Context;
-import android.content.Intent;
-import android.hardware.SensorManager;
 import android.media.projection.MediaProjection;
-import android.media.projection.MediaProjectionManager;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Display;
-import android.view.OrientationEventListener;
 import android.view.SurfaceView;
 
 import android.view.WindowManager;
-import androidx.activity.result.ActivityResultLauncher;
+
-import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -52,7 +51,6 @@ import org.greenrobot.eventbus.EventBus;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.lang.reflect.Field;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -83,6 +81,11 @@ import io.agora.rtc2.RtcEngineEx;
 import io.agora.rtc2.ScreenCaptureParameters;
 import io.agora.rtc2.video.VideoCanvas;
 import io.agora.rtc2.video.VideoEncoderConfiguration;
+import io.reactivex.Observable;
+import io.reactivex.ObservableSource;
+import io.reactivex.ObservableTransformer;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
 
 public class AgoraManager {
 
@@ -113,6 +116,9 @@ public class AgoraManager {
     private static ExecutorService executorService = Executors.newFixedThreadPool(3);
 
     public int pkUserId;
+    private Disposable disposableA;
+    private Disposable disposableB;
+    private Disposable disposableC;
 
     public void setLastRoomId(String value) {
         lastRoomId = value;
@@ -186,7 +192,7 @@ public class AgoraManager {
 
                 rtcEngine = (RtcEngineEx) RtcEngine.create(config);
             } catch (Exception e) {
-                Log.e("AgoraManager", "Failed to create RtcEngine", e);
+                LogUtils.e("AgoraManager", "Failed to create RtcEngine", e);
                 return;
             }
 
@@ -215,13 +221,13 @@ public class AgoraManager {
                                 "}");
                         rtcEngine.setParameters("{\"che.video.mobile_1080p\":true}");
                     } catch (Exception e) {
-                        Log.w("AgoraManager", "Failed to set parameters", e);
+                        LogUtils.w("AgoraManager", "Failed to set parameters", e);
                     }
 
                     rtcEngine.enableVideo();
                     rtcEngine.setDefaultAudioRoutetoSpeakerphone(true);
                 } catch (Exception e) {
-                    Log.e("AgoraManager", "Failed to configure RtcEngine", e);
+                    LogUtils.e("AgoraManager", "Failed to configure RtcEngine", e);
                 }
             }
         }
@@ -242,7 +248,7 @@ public class AgoraManager {
      */
     public void joinRoom(String token, String roomId, int uid, boolean isMicrophoneEnabled, boolean isCamerJs) {
         if (rtcEngine == null) {
-            Log.e("AgoraManager", "RtcEngine not initialized");
+            LogUtils.e("AgoraManager", "RtcEngine not initialized");
             init(CommonAppContext.getInstance().getCurrentEnvironment().getSwSdkAppId());
         }
         if (!mRoomId.isEmpty()) {
@@ -296,7 +302,7 @@ public class AgoraManager {
                 rtcEngine.leaveChannel();
             }
         } catch (Exception e) {
-            Log.e("AgoraManager", "Error during cleanup", e);
+            LogUtils.e("AgoraManager", "Error during cleanup", e);
         } finally {
             // 注意：不要在这里将rtcEngine设置为null
             // 应该在destroy方法中处理
@@ -326,7 +332,15 @@ public class AgoraManager {
             }
             handlers.clear();
         }
-
+        if (disposableA != null && !disposableA.isDisposed()){
+            disposableA.dispose();
+        }
+         if (disposableB != null && !disposableB.isDisposed()){
+             disposableB.dispose();
+        }
+         if (disposableC != null && !disposableC.isDisposed()){
+             disposableC.dispose();
+        }
         // 关闭线程池
         if (executorService != null && !executorService.isShutdown()) {
             executorService.shutdown();
@@ -378,11 +392,18 @@ public class AgoraManager {
     private IRtcEngineEventHandler getDefaultEventHandler() {
         return new IRtcEngineEventHandler() {
 
+
+            @Override
+            public void onAudioEffectFinished(int soundId) {
+                super.onAudioEffectFinished(soundId);
+                LogUtils.e("onAudioEffectFinished", "soundId------>" + soundId);
+            }
+
             @Override
             public void onRemoteAudioStateChanged(int uid, int state, int reason, int elapsed) {
                 super.onRemoteAudioStateChanged(uid, state, reason, elapsed);
-                LogUtils.e("onRemoteAudioStateChanged", "uid------>" + uid, "state------>" + state, "reason------>" + reason, "elapsed------>" + elapsed);
                 if (state == 0){
+                    LogUtils.e("onRemoteAudioStateChanged", "uid------>" + uid, "state------>" + state, "reason------>" + reason, "elapsed------>" + elapsed);
                     for (SoundLevelUpdateListener listener : soundLevelUpdateListeners) {
                         if (listener != null) {
                             // Pk 关闭远端推流
@@ -463,6 +484,7 @@ public class AgoraManager {
                     public void onSongSimpleInfoResult(String requestId, long songCode, String simpleInfo, int reason) {
 
                     }
+
                 });
 
 
@@ -557,7 +579,7 @@ public class AgoraManager {
             @Override
             public void onFirstRemoteAudioFrame(int uid, int elapsed) {
                 super.onFirstRemoteAudioFrame(uid, elapsed);
-                Log.i("RoomCabinFragment", "onFirstRemoteAudioFrame: uid->" + uid);
+                LogUtils.i("RoomCabinFragment", "onFirstRemoteAudioFrame: uid->" + uid);
 
 
             }
@@ -578,7 +600,7 @@ public class AgoraManager {
             @Override
             public void onRemoteVideoStateChanged(int uid, int state, int reason, int elapsed) {
                 super.onRemoteVideoStateChanged(uid, state, reason, elapsed);
-                Log.i("RoomCabinFragment", "onRemoteVideoStateChanged:uid->" + uid + ", state->" + state);
+                LogUtils.i("RoomCabinFragment", "onRemoteVideoStateChanged:uid->" + uid + ", state->" + state);
                 if (state == Constants.REMOTE_AUDIO_STATE_STOPPED) {
                     ColoseCardEvent renderView = new ColoseCardEvent();
                     EventBus.getDefault().post(renderView);
@@ -593,6 +615,25 @@ public class AgoraManager {
                 }
             }
 
+            @Override
+            public void onNetworkTypeChanged(int type) {
+                super.onNetworkTypeChanged(type);
+                switch (type) {
+                    case NETWORK_TYPE_UNKNOWN://未知网络
+
+                        break;
+                    case NETWORK_TYPE_DISCONNECTED://SDK与网络断开连接
+                        break;
+                    case NETWORK_TYPE_LAN:
+                    case NETWORK_TYPE_WIFI:
+                    case NETWORK_TYPE_MOBILE_2G:
+                    case NETWORK_TYPE_MOBILE_3G:
+                    case NETWORK_TYPE_MOBILE_4G:
+                    case NETWORK_TYPE_MOBILE_5G:
+                        break;
+
+                }
+            }
         };
     }
     /**
@@ -693,6 +734,7 @@ public class AgoraManager {
         };
     }
     public void potexao(String page) {
+        ClientRole(true);
         rtcEngine.playEffect(1, page, 0, 1, 0, 100, true);
     }
 
@@ -761,7 +803,7 @@ public class AgoraManager {
                     VD_1280x720,
                     FRAME_RATE_FPS_15,
                     STANDARD_BITRATE,
-                    ORIENTATION_MODE_FIXED_LANDSCAPE
+                    ORIENTATION_MODE_ADAPTIVE
             ));
             rtcEngine.startScreenCapture(screenCaptureParameters);
 
@@ -972,12 +1014,13 @@ public class AgoraManager {
      *                 type:1:个人点击了点歌按钮
      *                 type:2:别人进入后
      */
+    @SuppressLint("CheckResult")
     public void isPreload(long songCode, int type) {
         mSongCode = songCode;
         LogUtils.e("AgoraManager", "isPreload: " + songCode);
         // 确保 rtcEngine 已初始化
         if (rtcEngine == null) {
-            Log.e("AgoraManager", "RtcEngine not initialized, cannot preload music");
+            LogUtils.e("AgoraManager", "RtcEngine not initialized, cannot preload music");
             init(CommonAppContext.getInstance().getCurrentEnvironment().getSwSdkAppId());
             return;
         }
@@ -987,11 +1030,11 @@ public class AgoraManager {
             try {
                 musicContentCenter = IAgoraMusicContentCenter.create(rtcEngine);
                 if (musicContentCenter == null) {
-                    Log.e("AgoraManager", "Failed to create musicContentCenter");
+                    LogUtils.e("AgoraManager", "Failed to create musicContentCenter");
                     return;
                 }
             } catch (Exception e) {
-                Log.e("AgoraManager", "Exception creating musicContentCenter", e);
+                LogUtils.e("AgoraManager", "Exception creating musicContentCenter", e);
                 return;
             }
         }
@@ -1001,11 +1044,11 @@ public class AgoraManager {
             try {
                 musicPlayer = musicContentCenter.createMusicPlayer();
                 if (musicPlayer == null) {
-                    Log.e("AgoraManager", "Failed to create musicPlayer");
+                    LogUtils.e("AgoraManager", "Failed to create musicPlayer");
                     return;
                 }
             } catch (Exception e) {
-                Log.e("AgoraManager", "Exception creating musicPlayer", e);
+                LogUtils.e("AgoraManager", "Exception creating musicPlayer", e);
                 return;
             }
         }
@@ -1014,25 +1057,15 @@ public class AgoraManager {
         try {
             code = musicContentCenter.isPreloaded(mSongCode);
         } catch (Exception e) {
-            Log.e("AgoraManager", "Exception checking if song is preloaded", e);
+            LogUtils.e("AgoraManager", "Exception checking if song is preloaded", e);
             return;
         }
 
         if (type == 1) {
             if (code < 0) {
                 String result = musicContentCenter.preload(mSongCode);
-                // 使用后台线程池处理预加载检查，避免阻塞UI线程
+                disposableB = Observable.timer(3000, TimeUnit.MILLISECONDS).observeOn(AndroidSchedulers.mainThread()).subscribe(aLong -> {
-                executeInBackground(() -> {
+                    isPreload(mSongCode, type);
-                    try {
-                        Thread.sleep(3000); // 3秒延迟
-                        Log.d("AgoraManager", "Preload result: " + result);
-                        // 切换回主线程执行后续操作
-                        createTrackedHandler(Looper.getMainLooper()).post(() -> {
-                            isPreload(mSongCode, type);
-                        });
-                    } catch (Exception e) {
-                        Log.e("AgoraManager", "Preload song failed: songCode=" + mSongCode, e);
-                    }
                 });
             } else {
                 handleMusicPlayerState(songCode);
@@ -1041,23 +1074,14 @@ public class AgoraManager {
             if (code < 0) {
                 String result = musicContentCenter.preload(mSongCode);
                 // 使用后台线程池处理预加载检查，避免阻塞UI线程
-                executeInBackground(() -> {
+                disposableC = Observable.timer(3000, TimeUnit.MILLISECONDS).observeOn(AndroidSchedulers.mainThread()).subscribe(aLong -> {
-                    try {
-                        Thread.sleep(3000); // 3秒延迟
-                        Log.d("AgoraManager", "Preload result: " + result);
-                        // 切换回主线程执行后续操作
-                        createTrackedHandler(Looper.getMainLooper()).post(() -> {
                             isPreload(mSongCode, type);
                         });
-                    } catch (Exception e) {
-                        Log.e("AgoraManager", "Preload song failed: songCode=" + mSongCode, e);
-                    }
-                });
             } else {
                 try {
                     musicPlayer.open(mSongCode, 0);
                 } catch (Exception e) {
-                    Log.e("AgoraManager", "Open music failed: songCode=" + mSongCode, e);
+                    LogUtils.e("AgoraManager", "Open music failed: songCode=" + mSongCode, e);
                 }
             }
         }
@@ -1066,7 +1090,7 @@ public class AgoraManager {
     // 提取音乐播放器状态处理逻辑到单独的方法
     private void handleMusicPlayerState(long songCode) {
         if (musicPlayer == null) {
-            Log.e("AgoraManager", "Music player is null, cannot handle state");
+            LogUtils.e("AgoraManager", "Music player is null, cannot handle state");
             return;
         }
 
@@ -1081,16 +1105,8 @@ public class AgoraManager {
                     LogUtils.e("lxj", "空闲");
                     musicPlayer.open(songCode, 0);
                     // 使用后台线程处理延迟任务，避免阻塞UI线程
-                    executeInBackground(() -> {
+                    disposableA = Observable.timer(2000, TimeUnit.MILLISECONDS).observeOn(AndroidSchedulers.mainThread()).subscribe(aLong -> {
-                        try {
+                        isPreload(mSongCode, 1);
-                            Thread.sleep(2000); // 2秒延迟
-                            // 切换回主线程执行后续操作
-                            createTrackedHandler(Looper.getMainLooper()).post(() -> {
-                                isPreload(songCode, 1);
-                            });
-                        } catch (Exception e) {
-                            Log.e("AgoraManager", "Error in idle state handling", e);
-                        }
                     });
                     break;
                 case PLAYER_STATE_OPEN_COMPLETED:
@@ -1125,7 +1141,7 @@ public class AgoraManager {
                     break;
             }
         } catch (Exception e) {
-            Log.e("AgoraManager", "Exception handling music player state", e);
+            LogUtils.e("AgoraManager", "Exception handling music player state", e);
         }
     }
 
@@ -1280,7 +1296,7 @@ public class AgoraManager {
                         musicList.remove(musicList.get(0));
                     });
                 } catch (Exception e) {
-                    Log.e("AgoraManager", "Error in nextSong", e);
+                    LogUtils.e("AgoraManager", "Error in nextSong", e);
                 }
             });
 
@@ -1368,7 +1384,7 @@ public class AgoraManager {
 
     public static byte[] convertFileToByteArray(File file) {
         if (file == null || !file.exists()) {
-            Log.e("AgoraManager", "File is null or does not exist");
+            LogUtils.e("AgoraManager", "File is null or does not exist");
             return null;
         }
 
@@ -1379,16 +1395,16 @@ public class AgoraManager {
             byteArray = new byte[(int) file.length()];
             int bytesRead = fis.read(byteArray);
             if (bytesRead != byteArray.length) {
-                Log.w("AgoraManager", "Could not read entire file: " + file.getPath());
+                LogUtils.w("AgoraManager", "Could not read entire file: " + file.getPath());
             }
         } catch (Exception e) {
-            Log.e("AgoraManager", "Error converting file to byte array", e);
+            LogUtils.e("AgoraManager", "Error converting file to byte array", e);
         } finally {
             if (fis != null) {
                 try {
                     fis.close();
                 } catch (Exception e) {
-                    Log.e("AgoraManager", "Error closing file input stream", e);
+                    LogUtils.e("AgoraManager", "Error closing file input stream", e);
                 }
             }
         }

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

@@ -1,5 +1,14 @@
 package com.xscm.moduleutil.rtc;
 
+import static io.agora.rtc2.Constants.NETWORK_TYPE_DISCONNECTED;
+import static io.agora.rtc2.Constants.NETWORK_TYPE_LAN;
+import static io.agora.rtc2.Constants.NETWORK_TYPE_MOBILE_2G;
+import static io.agora.rtc2.Constants.NETWORK_TYPE_MOBILE_3G;
+import static io.agora.rtc2.Constants.NETWORK_TYPE_MOBILE_4G;
+import static io.agora.rtc2.Constants.NETWORK_TYPE_MOBILE_5G;
+import static io.agora.rtc2.Constants.NETWORK_TYPE_UNKNOWN;
+import static io.agora.rtc2.Constants.NETWORK_TYPE_WIFI;
+
 import com.blankj.utilcode.util.ObjectUtils;
 import com.blankj.utilcode.util.ThreadUtils;
 import com.xscm.moduleutil.interfaces.SoundLevelUpdateListener;
@@ -21,7 +30,7 @@ public class MyIRtcEngineEventHandler extends IRtcEngineEventHandler {
         this.mRtcEventListener = mRtcEventListener;
     }
 
-    public MyIRtcEngineEventHandler(RtcEventListener mRtcEventListener,List<SoundLevelUpdateListener> soundLevelUpdateListeners) {
+    public MyIRtcEngineEventHandler(RtcEventListener mRtcEventListener, List<SoundLevelUpdateListener> soundLevelUpdateListeners) {
         this.soundLevelUpdateListeners = soundLevelUpdateListeners;
         this.mRtcEventListener = mRtcEventListener;
     }
@@ -80,7 +89,7 @@ public class MyIRtcEngineEventHandler extends IRtcEngineEventHandler {
             if (!ObjectUtils.isEmpty(soundLevelUpdateListeners)) {
                 for (SoundLevelUpdateListener listener : soundLevelUpdateListeners) {
                     if (listener != null) {
-                        listener.onRemoteSoundLevelUpdate(info.uid > 0 ? String.valueOf(info.uid) : SpUtil.getUserId()+"", info.volume);
+                        listener.onRemoteSoundLevelUpdate(info.uid > 0 ? String.valueOf(info.uid) : SpUtil.getUserId() + "", info.volume);
                     }
                 }
             }
@@ -108,4 +117,12 @@ public class MyIRtcEngineEventHandler extends IRtcEngineEventHandler {
             });
         }
     }
+
+    @Override
+    public void onNetworkTypeChanged(int type) {
+        super.onNetworkTypeChanged(type);
+        if (mRtcEventListener != null) {
+            mRtcEventListener.onNetworkTypeChanged(type);
+        }
+    }
 }

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

@@ -47,4 +47,8 @@ public interface RtcEventListener {
 
     void destroy();
 
+
+    void onNetworkTypeChanged(int type);
+
+
 }

BaseModule/src/main/java/com/xscm/moduleutil/service/IMConnectionService.java

@@ -36,7 +36,7 @@ public class IMConnectionService extends Service {
             Log.d(TAG, "IM connect success");
             if (CommonAppContext.getInstance().playId != null) {
                 LogUtils.e("@@@", ""+CommonAppContext.getInstance().playId);
-                RetrofitClient.getInstance().roomUserReconnect(CommonAppContext.getInstance().playId);
+//                RetrofitClient.getInstance().roomUserReconnect(CommonAppContext.getInstance().playId);
             }
         }
 

BaseModule/src/main/java/com/xscm/moduleutil/service/MqttConnect.java

@@ -46,11 +46,10 @@ public class MqttConnect {
         this.clientId = clientId;
 
         // 这里是你自己需要订阅的主题
-        shutdown = "qx_room_topic"; // 关机
+        shutdown = "qx_room_topic"; // 房间飘屏
-        update_app = "qx_xunlehui"; // 发送更新APP
+        update_app = "qx_xunlehui"; // 巡乐会飘屏
-//        qx_hour_ranking = "qx_hour_ranking";
+        qx_hour_ranking = "qx_hour_ranking";//小时榜飘屏
-        qx_hour_ranking = "qx_hour_ranking";
+        qx_redpacket_arrive = "qx_redpacket_arrive"; //红包飘屏的主题
-        qx_redpacket_arrive = "qx_redpacket_arrive";
 
         ArrayList<String> topicList = new ArrayList<>();
         topicList.add(shutdown);

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

@@ -19,7 +19,7 @@ import java.util.Map;
 public class ColorManager {
     private static ColorManager instance;
     private String primaryColor = "#3ABC6D"; // 默认主题色
-    private String buttonColor = "#6D6D6D"; // 默认按钮色
+    private String buttonColor = "#FFFFFF"; // 默认按钮色
 
     // 监听器列表，用于通知颜色变化
     private List<ColorChangeListener> listeners = new ArrayList<>();
@@ -80,7 +80,7 @@ public class ColorManager {
         try {
             return Color.parseColor(buttonColor);
         } catch (Exception e) {
-            return Color.parseColor("#6D6D6D"); // 默认颜色
+            return Color.parseColor("#FFFFFF"); // 默认颜色
         }
     }
 

BaseModule/src/main/java/com/xscm/moduleutil/utils/CustomMsgCode.kt

@@ -0,0 +1,8 @@
+package com.xscm.moduleutil.utils
+
+object CustomMsgCode {
+    val CODE_TASK_APPRENTICE_JOIN_ROOM_TIMER_ID = "132"
+    val CODE_TASK_APPRENTICE_JOIN_ROOM = 132
+    val CODE_TASK_APPRENTICE_JOIN_ROOM_MSG = "您的师傅邀请您进入房间，您是否同意？"
+    val CODE_TASK_APPRENTICE_JOIN_ROOM_MSG_REFUSE = "您的徒弟拒绝了您的邀请。"
+}

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

@@ -135,7 +135,7 @@ public class DateSelectDialog extends BaseBottomSheetDialog<MeDialogDateSelectBi
         int currentDay = TimeUtils.getDay();
 
         // 如果是最大年份且是最大月份，则日期不能超过当前日期
-        if (year == currentYear - 16 && month == currentMonth) {
+        if (year == currentYear - 18 && month == currentMonth) {
             dayLimit = currentDay;
         }
 
@@ -158,7 +158,7 @@ public class DateSelectDialog extends BaseBottomSheetDialog<MeDialogDateSelectBi
 
         int monthLimit = 12;
         // 如果是最大年份（16年前），则月份不能超过当前月份
-        if (year == currentYear - 16) {
+        if (year == currentYear - 18) {
             monthLimit = currentMonth;
         }
 
@@ -175,7 +175,7 @@ public class DateSelectDialog extends BaseBottomSheetDialog<MeDialogDateSelectBi
     private List<DateBean> getYear() {
         int currentYear = TimeUtils.getYear();
         int minYear = currentYear - 100; // 最小年份设为100年前
-        int maxYear = currentYear - 16;  // 最大年份设为16年前
+        int maxYear = currentYear - 18;  // 最大年份设为16年前
 
         List<DateBean> yearList = new ArrayList<>();
         for (int i = minYear; i <= maxYear; i++) {

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

@@ -1,16 +1,21 @@
 package com.xscm.moduleutil.utils;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Looper;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
 import android.util.Log;
 
 import com.alibaba.android.arouter.utils.TextUtils;
 import com.blankj.utilcode.util.FileUtils;
+import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ThreadUtils;
+import com.blankj.utilcode.util.ToastUtils;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -19,6 +24,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import io.reactivex.Observable;
+import io.reactivex.ObservableEmitter;
+import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -41,14 +51,58 @@ public class DownloadUtil {
     private static final String PATH_AUDIO = Environment.getExternalStorageDirectory() + "/qipao/audio";
 
 
-    public DownloadUtil(Context context) {
+    @SuppressLint("CheckResult")
+    public DownloadUtil(Context context, String downUrl,final DownloadListener downloadListener) {
+        // 1. 判空，避免空指针
+        if (context == null) {
+            ToastUtils.showShort("Context 不能为 null！");
+            LogUtils.e("Context 不能为 null！."+(mApi == null));
+            return;
+        }
+        if (downUrl == null || downUrl.trim().isEmpty()) {
+            ToastUtils.showShort("下载链接不能为 null 或空！");
+            LogUtils.e("下载链接不能为 null 或空！."+(mApi == null));
+            return;
+        }
+
         this.mContext = context;
+        final String dUrl = downUrl;
+        File qipaoDir = new File(mContext.getFilesDir(), PATH_APK);
+        if (qipaoDir.exists() && qipaoDir.isDirectory()) {
+            Observable.create(new ObservableOnSubscribe<Boolean>() {
+                @Override
+                public void subscribe(ObservableEmitter<Boolean> emitter) throws Exception {
+                    LogUtils.e("删除文件中."+(mApi == null));
+                    FileUtils.deleteAllInDir(qipaoDir);
+                    emitter.onNext(true);
+                }
+            }).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(result -> {
+                LogUtils.e("删除成功."+(mApi == null));
+                if (mApi == null) {
+                    //初始化网络请求接口
+                    mApi = ApiHelper.getInstance().createService(ApiInterface.class);
+                    int i = dUrl.lastIndexOf('/');//一定是找最后一个'/'出现的位置
+                    String downUrlEnd = "";
+                    if (i != -1) {
+                        downUrlEnd = dUrl.substring(i);
+                    }
+                    mApkPath = new File(mContext.getFilesDir(), PATH_APK + downUrlEnd).getAbsolutePath();
+                }
+                downloadFile(dUrl, downloadListener);
+            });
+        } else {
+            LogUtils.e("else  ."+(mApi == null));
+            if (mApi == null) {
+                //初始化网络请求接口
+                mApi = ApiHelper.getInstance().createService(ApiInterface.class);
+                int i = downUrl.lastIndexOf('/');//一定是找最后一个'/'出现的位置
+                if (i != -1) {
+                    downUrl = downUrl.substring(i);
+                }
+                mApkPath = new File(mContext.getFilesDir(), PATH_APK + downUrl).getAbsolutePath();
+            }
 
-        if (mApi == null) {
+            downloadFile(downUrl, downloadListener);
-            //初始化网络请求接口
-            mApi = ApiHelper.getInstance().createService(ApiInterface.class);
-            mApkPath = new File(mContext.getFilesDir(), PATH_APK).getAbsolutePath();
-
         }
     }
 

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

@@ -207,7 +207,7 @@ public class ImageUtils {
                 return;
             }
         }
-        Glide.with(mImageView).load(path).diskCacheStrategy(DiskCacheStrategy.ALL).into(mImageView);
+        Glide.with(mImageView).load(path).placeholder(R.mipmap.default_avatar).diskCacheStrategy(DiskCacheStrategy.ALL).into(mImageView);
     }
 
     public static void loadHeadCC(String path, ImageView mImageView) {

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

@@ -23,6 +23,7 @@ public class MeHeadView extends ConstraintLayout {
     private ImageView mIvSex;
     private ImageView mIvOnline;
     private ImageView iv_frame_bg;
+    private ImageView iv_master_bg;
 
     public MeHeadView(Context context) {
         this(context, null, 0);
@@ -43,12 +44,68 @@ public class MeHeadView extends ConstraintLayout {
         mIvFrame = findViewById(R.id.iv_frame);
         mIvSex = findViewById(R.id.iv_sex);
         mIvOnline = findViewById(R.id.iv_online);
-        iv_frame_bg=findViewById(R.id.iv_frame_bg);
+        iv_frame_bg = findViewById(R.id.iv_frame_bg);
+        iv_master_bg = findViewById(R.id.iv_master_bg);
         mIvSex.setVisibility(GONE);
     }
 
     public void setData(String headPicture, String framePicture, String nobilityImage) {
         LogUtils.e(headPicture, framePicture, nobilityImage);
+        if (!TextUtils.isEmpty(headPicture)) {
+            ImageUtils.loadHeadCC(headPicture, mRiv);
+        }
+        if (TextUtils.isEmpty(framePicture)) {
+            mIvFrame.setVisibility(GONE);
+        } else {
+            mIvFrame.setVisibility(VISIBLE);
+            mIvFrame.setSource(framePicture, 1);
+        }
+
+        if (nobilityImage != null && !TextUtils.isEmpty(nobilityImage)) {
+            iv_frame_bg.setVisibility(VISIBLE);
+            ImageUtils.loadRoomItem(nobilityImage, iv_frame_bg);
+        } else {
+            iv_frame_bg.setVisibility(GONE);
+        }
+
+    }
+
+    public void setMaster(String headPicture) {
+        if (!TextUtils.isEmpty(headPicture)) {
+            ImageUtils.loadHead(headPicture, mRiv);
+        }
+
+        iv_master_bg.setVisibility(VISIBLE);
+        iv_master_bg.setImageResource(R.mipmap.icon_master);
+    }
+
+    public void setOnline(boolean isOnline) {
+        mIvOnline.setVisibility(VISIBLE);
+        mIvOnline.setImageResource(isOnline ? R.mipmap.me_online_icon : R.mipmap.me_icon_unchecked);
+    }
+
+    public void setSex(int sex, String headPicture, String dress) {
+        if (!TextUtils.isEmpty(headPicture)) {
+            ImageUtils.loadHead(headPicture, mRiv);
+        }
+        if (TextUtils.isEmpty(dress)) {
+            mIvFrame.setVisibility(GONE);
+        } else {
+            mIvFrame.setVisibility(VISIBLE);
+            mIvFrame.setSource(dress, 1);
+        }
+        mIvSex.setVisibility(VISIBLE);
+        mIvSex.setImageResource(sex == 1 ? R.mipmap.nan : R.mipmap.nv);
+    }
+
+    /**
+     * 设置头像，性别，头像框，贵族
+     * @param sex
+     * @param headPicture
+     * @param framePicture
+     * @param nobilityImage
+     */
+    public void setAll(int sex,String headPicture, String framePicture, String nobilityImage) {
         if (!TextUtils.isEmpty(headPicture)) {
             ImageUtils.loadHead(headPicture, mRiv);
         }
@@ -59,17 +116,13 @@ public class MeHeadView extends ConstraintLayout {
             mIvFrame.setSource(framePicture, 1);
         }
 
-        if (nobilityImage!=null && !TextUtils.isEmpty(nobilityImage)){
+        mIvSex.setImageResource(sex == 1 ? R.mipmap.nan : R.mipmap.nv);
+        if (nobilityImage != null && !TextUtils.isEmpty(nobilityImage)) {
             iv_frame_bg.setVisibility(VISIBLE);
-            ImageUtils.loadHead(nobilityImage, iv_frame_bg);
+            ImageUtils.loadRoomItem(nobilityImage, iv_frame_bg);
-        }else {
+        } else {
             iv_frame_bg.setVisibility(GONE);
         }
 
     }
-
-    public void setOnline(boolean isOnline) {
-        mIvOnline.setVisibility(VISIBLE);
-        mIvOnline.setImageResource(isOnline ? R.mipmap.me_online_icon : R.mipmap.me_icon_unchecked);
-    }
 }

BaseModule/src/main/java/com/xscm/moduleutil/utils/NullToEmptyStringAdapter.kt

@@ -0,0 +1,21 @@
+package com.xscm.moduleutil.utils
+
+import com.google.gson.TypeAdapter
+import com.google.gson.stream.JsonReader
+import com.google.gson.stream.JsonToken
+import com.google.gson.stream.JsonWriter
+
+class NullToEmptyStringAdapter : TypeAdapter<String>() {
+    override fun write(out: JsonWriter, value: String?) {
+        out.value(value ?: "")
+    }
+
+    override fun read(`in`: JsonReader): String {
+        return if (`in`.peek() == JsonToken.NULL) {
+            `in`.nextNull()
+            "" // null → 空字符串
+        } else {
+            `in`.nextString() ?: ""
+        }
+    }
+}

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

@@ -1,5 +1,7 @@
 package com.xscm.moduleutil.utils;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -189,7 +191,7 @@ public class TimeUtils {
     }
     public static String getDateToStringNoZ(long time) {
         Date d = new Date(time);
-        SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         return sf.format(d);
     }
 
@@ -237,4 +239,83 @@ public class TimeUtils {
 
         return sb.toString().trim();
     }
+
+    /**
+     * 格式化时长（毫秒），只返回天数部分。
+     * 例如：输入 90000000 (90,000秒，即1天多)，返回 "1天"
+     *
+     * @param durationMs 时长，单位为毫秒
+     * @return 格式化后的天数字符串，如 "1天"，如果不足一天则返回空字符串 ""
+     */
+    public static String formatDurationDaysOnly(long durationMs) {
+        long totalSeconds = durationMs / 1000;
+        long days = totalSeconds / 86400;
+
+        // 如果天数大于0，则构建返回字符串
+        if (days > 0) {
+            return days + "天";
+        }
+
+        // 如果天数不足1天，根据需求可以返回空字符串，也可以返回 "0天" 或其他
+        return "1天"; // 或者 return "0天";
+    }
+
+
+    /**
+     * 计算时间差值并向上取整为天数
+     * @param currentTimeMillis 当前时间（毫秒级时间戳）
+     * @param createTimeSecond 创建时间（秒级时间戳）
+     * @return 向上取整后的天数
+     */
+    public static int calculateDays(long currentTimeMillis, long createTimeSecond) {
+        // 1. 计算时间差（毫秒）
+        long timeDiffMillis = currentTimeMillis - createTimeSecond;
+
+        // 2. 转换为天数（1天 = 24*60*60*1000 毫秒）
+        BigDecimal daysDecimal = new BigDecimal(timeDiffMillis)
+                .divide(new BigDecimal(24 * 60 * 60 * 1000), 10, RoundingMode.HALF_UP);
+
+        // 3. 向上取整（即使是 8.0001 天也会变成 9 天）
+        return daysDecimal.setScale(0, RoundingMode.CEILING).intValue();
+    }
+
+    /**
+     * 根据生日字符串计算年龄
+     * @param birthDay 生日字符串，格式为 "yyyy-MM-dd"
+     * @return 年龄
+     */
+    public static int getAgeByBirthDay(String birthDay) {
+        if (birthDay == null || birthDay.isEmpty()) {
+            return 0;
+        }
+        
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            Date birthDate = sdf.parse(birthDay);
+            
+            Calendar cal = Calendar.getInstance();
+            int currentYear = cal.get(Calendar.YEAR);
+            int currentMonth = cal.get(Calendar.MONTH);
+            int currentDay = cal.get(Calendar.DAY_OF_MONTH);
+            
+            cal.setTime(birthDate);
+            int birthYear = cal.get(Calendar.YEAR);
+            int birthMonth = cal.get(Calendar.MONTH);
+            int birthDayOfMonth = cal.get(Calendar.DAY_OF_MONTH);
+            
+            int age = currentYear - birthYear;
+            
+            // 如果当前月份小于生日月份，或者月份相同但当前日期小于生日日期，则年龄减1
+            if (currentMonth < birthMonth || 
+                (currentMonth == birthMonth && currentDay < birthDayOfMonth)) {
+                age--;
+            }
+            
+            return age < 0 ? 0 : age;
+        } catch (ParseException e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
 }

BaseModule/src/main/java/com/xscm/moduleutil/utils/roomview/RoomCPView.java

@@ -0,0 +1,939 @@
+package com.xscm.moduleutil.utils.roomview;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.os.AsyncTask;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.AlphaAnimation;
+import android.view.animation.Animation;
+import android.view.animation.AnimationSet;
+import android.view.animation.Interpolator;
+import android.view.animation.OvershootInterpolator;
+import android.view.animation.TranslateAnimation;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
+
+import com.blankj.utilcode.util.LogUtils;
+import com.tencent.qgame.animplayer.AnimConfig;
+import com.tencent.qgame.animplayer.AnimView;
+import com.tencent.qgame.animplayer.inter.IAnimListener;
+import com.xscm.moduleutil.R;
+import com.xscm.moduleutil.utils.ImageUtils;
+import com.xscm.moduleutil.widget.CircularImage;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
+
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.functions.Consumer;
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
+/**
+ * 项目名称：羽声语音
+ * 时间：2025/11/24 9:50
+ * 用途：
+ */
+public class RoomCPView extends FrameLayout {
+
+    private AnimView anim_cp;
+
+    private boolean isLoadEffect = false;
+    private boolean isShow = true; // 是否开启特效
+    private ReentrantLock lock = new ReentrantLock();
+    private List<String> animationArray = new ArrayList<>();
+    public ExecutorService queue = Executors.newSingleThreadExecutor();
+    private Context mContext;
+    private boolean isOnece;
+
+    private CircularImage room_cp_head1;
+    private CircularImage room_cp_head2;
+    private TextView room_cp_name1, room_cp_name2;
+    private LinearLayout avatarContainer1;
+    private ConstraintLayout avatarsParentContainer;
+
+    // 动画队列和锁机制
+    private final Queue<AnimationTask> animationQueue = new LinkedList<>();
+    private boolean isAnimationRunning = false;
+    private final Object animationLock = new Object();
+
+    // 下载任务缓存
+    private final Queue<DownloadTask> downloadQueue = new LinkedList<>();
+    private boolean isDownloadRunning = false;
+    private final Object downloadLock = new Object();
+
+    private String currPlayPath = "";
+
+    public void setQueue(ExecutorService queue) {
+        this.queue = queue;
+    }
+
+    public RoomCPView(@NonNull Context context) {
+        super(context);
+        this.mContext = context;
+        init();
+    }
+
+    public RoomCPView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        this.mContext = context;
+        init();
+    }
+
+    public RoomCPView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        this.mContext = context;
+        init();
+    }
+
+    public RoomCPView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        this.mContext = context;
+        init();
+    }
+
+    private void init() {
+        isLoadEffect = false;
+
+        initView();
+
+        // 设置动画监听器
+        setupAnimListener();
+    }
+
+    /**
+     * 设置动画监听器
+     */
+    private void setupAnimListener() {
+        if (anim_cp != null) {
+            anim_cp.setAnimListener(new IAnimListener() {
+                @Override
+                public void onVideoDestroy() {
+                    LogUtils.e("onVideoDestroy");
+                }
+
+                @Override
+                public void onVideoComplete() {
+                    LogUtils.e("onVideoComplete");
+                    // 确保所有UI操作在主线程中执行
+                    post(() -> {
+                        if (anim_cp != null) {
+                            // 停止头像动画
+                            stopAvatarAnimation();
+
+                            // 隐藏动画视图和头像
+                            anim_cp.setVisibility(View.GONE);
+                            avatarContainer1.setVisibility(View.GONE);
+
+                            if (isOnece) {
+                                return;
+                            }
+                            // 通知播放完成
+                            notifyPlaybackComplete();
+                            loadStartAnimation();
+                        }
+                    });
+                }
+
+                @Override
+                public void onVideoRender(int i, @Nullable AnimConfig animConfig) {
+                    // LogUtils.e("onVideoRender", i, animConfig);
+                }
+
+                @Override
+                public void onVideoStart() {
+                    LogUtils.e("onVideoStart");
+                    // 确保所有UI操作在主线程中执行
+                    post(() -> {
+                        // 动画开始，显示视图和头像
+                        setVisibility(View.VISIBLE);
+                        anim_cp.setVisibility(View.VISIBLE);
+                        avatarContainer1.setVisibility(View.VISIBLE);
+
+
+                        // 启动头像上下浮动动画
+//                        startAvatarFloatAnimation();
+                    });
+                }
+
+                @Override
+                public boolean onVideoConfigReady(@NonNull AnimConfig animConfig) {
+                    LogUtils.e("onVideoConfigReady", animConfig);
+                    return true;
+                }
+
+                @Override
+                public void onFailed(int i, @Nullable String s) {
+                    LogUtils.e("onFailed", s);
+                    // 确保所有UI操作在主线程中执行
+                    post(() -> {
+                        // 动画失败，隐藏视图
+                        setVisibility(View.GONE);
+                        anim_cp.setVisibility(View.GONE);
+                        // 继续播放下一个
+                        loadStartAnimation();
+                    });
+                }
+            });
+        }
+    }
+
+    private void initView() {
+        LayoutInflater.from(getContext()).inflate(R.layout.room_cp_vip_view, this, true);
+        anim_cp = findViewById(R.id.anim_cp);
+        room_cp_head1 = findViewById(R.id.room_cp_head1);
+        room_cp_head2 = findViewById(R.id.room_cp_head2);
+        room_cp_name1 = findViewById(R.id.room_cp_name1);
+        room_cp_name2 = findViewById(R.id.room_cp_name2);
+
+        // 获取头像的父布局
+        avatarContainer1 = findViewById(R.id.ll_head);
+
+        // 获取包含两个头像的父 LinearLayout
+        avatarsParentContainer = (ConstraintLayout) avatarContainer1.getParent();
+
+//        // 初始状态隐藏头像和名称
+//        room_cp_head1.setVisibility(View.GONE);
+//        room_cp_head2.setVisibility(View.GONE);
+//        room_cp_name1.setVisibility(View.GONE);
+//        room_cp_name2.setVisibility(View.GONE);
+    }
+
+    public void setCPTextData(String room_head1, String room_head2, String room_cp_name1, String room_cp_name2) {
+        ImageUtils.loadHeadCC(room_head1, room_cp_head1);
+        ImageUtils.loadHeadCC(room_head2, room_cp_head2);
+        this.room_cp_name1.setText(room_cp_name1);
+        this.room_cp_name2.setText(room_cp_name2);
+    }
+
+    private void loadStartAnimation() {
+        if (!isShow) {
+            // isshow 为是否开启特效  如果未开启则return
+            return;
+        }
+
+        String animationPath = null;
+
+        // list加锁
+        lock.lock();
+        try {
+            // 如果list长度大于0
+            if (!animationArray.isEmpty()) {
+                // 动画路径则赋值，取list中的第一个数据
+                animationPath = animationArray.get(0);
+                // 移除list的第一条数据
+                animationArray.remove(0);
+                isLoadEffect = true;
+            } else {
+                isLoadEffect = false;
+                // 队列为空，释放资源但不销毁视图
+                post(() -> {
+                    destroyEffectView();
+                });
+            }
+        } finally {
+            // 解锁
+            lock.unlock();
+        }
+
+        if (isLoadEffect && animationPath != null && !TextUtils.isEmpty(animationPath)) {
+            String finalAnimationPath = animationPath;
+            post(new Runnable() {
+                @Override
+                public void run() {
+                    // 处理MP4动画文件（可能是网络URL）
+                    handleMP4File(finalAnimationPath, new DownloadCallback() {
+                        @Override
+                        public void onSuccess(String localPath) {
+                            post(() -> {
+                                // 设置MP4动画文件
+                                currPlayPath = localPath;
+                                // 启动从底部弹起动画
+                                startBottomUpAnimation();
+
+                                // 开始播放动画
+                                anim_cp.setLoop(1);
+                            });
+                        }
+
+                        @Override
+                        public void onError(String error) {
+                            LogUtils.e("MP4下载或播放失败: " + error);
+                            // 处理失败情况，继续播放下一个
+                            post(() -> {
+                                lock.lock();
+                                try {
+                                    isLoadEffect = false;
+                                } finally {
+                                    lock.unlock();
+                                }
+                                loadStartAnimation();
+                            });
+                        }
+                    });
+                }
+            });
+        }
+    }
+
+
+    /**
+     * CP特效进来
+     *
+     * @param room_head1 头像1
+     * @param room_head2 头像2
+     * @param room_name1 名称1
+     * @param room_name2 名称2
+     * @param mp4Path    MP4动画文件路径
+     */
+    public void displayEffectView(String room_head1, String room_head2, String room_name1, String room_name2, String mp4Path) {
+        // 确保视图已初始化
+        reinitView();
+
+        // 设置CP数据，但不显示头像
+        setCPTextData(room_head1, room_head2, room_name1, room_name2);
+
+        // 确保头像初始为隐藏状态
+//        room_cp_head1.setVisibility(View.GONE);
+//        room_cp_head2.setVisibility(View.GONE);
+//        room_cp_name1.setVisibility(View.GONE);
+//        room_cp_name2.setVisibility(View.GONE);
+
+        // 确保视图可见
+        setVisibility(View.VISIBLE);
+
+        // 检查队列是否已初始化
+        if (queue == null) {
+            queue = Executors.newSingleThreadExecutor();
+        }
+
+        queue.execute(new Runnable() {
+            @SuppressLint("CheckResult")
+            @Override
+            public void run() {
+                // 如果mp4Path不存在return
+                if (mp4Path == null || mp4Path.isEmpty()) {
+                    return;
+                }
+
+                // 将mp4Path链接转为小写
+                String playImage = mp4Path;
+                String pathExtension = getFileExtension(playImage).toLowerCase();
+
+                // 判定礼物的后缀是否为svga或者mp4如果非这两种 则return
+                if (!("svga".equals(pathExtension) || "mp4".equals(pathExtension))) {
+                    return;
+                }
+
+                // 锁住list
+                lock.lock();
+                try {
+                    // 添加动画数据进list
+                    animationArray.add(playImage);
+
+                    // 如果没有在加载则开始加载
+                    if (!isLoadEffect) {
+                        // 更改加载状态标记
+                        Observable.timer(2000, TimeUnit.MILLISECONDS).observeOn(AndroidSchedulers.mainThread()).subscribe(new Consumer<Long>() {
+                            @Override
+                            public void accept(Long aLong) throws Exception {
+                                isLoadEffect = true;
+                                loadStartAnimation();
+                            }
+                        });
+
+                    }
+                } finally {
+                    // 解锁
+                    lock.unlock();
+                }
+            }
+        });
+    }
+
+
+    /**
+     * 原始的动画方法，现在只被内部调用
+     */
+    public void startAnimation(AnimationListener listener) {
+        // 设置进入动画
+        AlphaAnimation fadeIn = new AlphaAnimation(0f, 1f);
+        fadeIn.setDuration(500);
+        fadeIn.setAnimationListener(new Animation.AnimationListener() {
+            @Override
+            public void onAnimationStart(Animation animation) {
+            }
+
+            @Override
+            public void onAnimationEnd(Animation animation) {
+                // 保持显示1秒后开始退出动画
+                postDelayed(() -> {
+                    AlphaAnimation fadeOut = new AlphaAnimation(1f, 0f);
+                    fadeOut.setDuration(500);
+                    fadeOut.setAnimationListener(new Animation.AnimationListener() {
+                        @Override
+                        public void onAnimationStart(Animation animation) {
+                        }
+
+                        @Override
+                        public void onAnimationEnd(Animation animation) {
+                            if (listener != null) {
+                                listener.onAnimationEnd();
+                            }
+                        }
+
+                        @Override
+                        public void onAnimationRepeat(Animation animation) {
+                        }
+                    });
+                    startAnimation(fadeOut);
+                }, 1000);
+            }
+
+            @Override
+            public void onAnimationRepeat(Animation animation) {
+            }
+        });
+        startAnimation(fadeIn);
+    }
+
+    public interface AnimationListener {
+        void onAnimationEnd();
+    }
+
+    // 添加播放完成监听接口
+    public interface OnPlaybackCompleteListener {
+        void onPlaybackComplete();
+    }
+
+    // 添加成员变量
+    private List<OnPlaybackCompleteListener> playbackCompleteListeners = new ArrayList<>();
+
+    // 添加监听器管理方法
+    public void addOnPlaybackCompleteListener(OnPlaybackCompleteListener listener) {
+        if (listener != null && !playbackCompleteListeners.contains(listener)) {
+            playbackCompleteListeners.add(listener);
+        }
+    }
+
+    public void removeOnPlaybackCompleteListener(OnPlaybackCompleteListener listener) {
+        if (listener != null) {
+            playbackCompleteListeners.remove(listener);
+        }
+    }
+
+    public void clearPlaybackCompleteListeners() {
+        playbackCompleteListeners.clear();
+    }
+
+    // 触发播放完成回调的方法
+    private void notifyPlaybackComplete() {
+        for (OnPlaybackCompleteListener listener : new ArrayList<>(playbackCompleteListeners)) {
+            if (listener != null) {
+                listener.onPlaybackComplete();
+            }
+        }
+    }
+
+    /**
+     * 动画任务类，用于存储动画所需的数据
+     */
+    public static class AnimationTask {
+        String room_head1;
+        String room_head2;
+        String room_cp_name1;
+        String room_cp_name2;
+        String mp4Path; // MP4动画文件路径
+        AnimationListener listener;
+
+        AnimationTask(String room_head1, String room_head2, String room_cp_name1, String room_cp_name2, String mp4Path, AnimationListener listener) {
+            this.room_head1 = room_head1;
+            this.room_head2 = room_head2;
+            this.room_cp_name1 = room_cp_name1;
+            this.room_cp_name2 = room_cp_name2;
+            this.mp4Path = mp4Path;
+            this.listener = listener;
+        }
+    }
+
+    /**
+     * 处理MP4文件，如果是网络URL则下载到本地
+     *
+     * @param path     文件路径或URL
+     * @param callback 下载回调
+     */
+    private void handleMP4File(String path, DownloadCallback callback) {
+        // 判断是否是网络URL
+        if (path != null && (path.startsWith("http://") || path.startsWith("https://"))) {
+            // 是网络URL，需要下载
+            downloadFile(path, callback);
+        } else {
+            // 本地路径，直接使用
+            if (callback != null) {
+                callback.onSuccess(path);
+            }
+        }
+    }
+
+    /**
+     * 下载文件到本地
+     *
+     * @param url      下载URL
+     * @param callback 下载回调
+     */
+    private void downloadFile(String url, DownloadCallback callback) {
+        synchronized (downloadLock) {
+            // 创建下载任务并加入队列
+            DownloadTask task = new DownloadTask(url, callback);
+            downloadQueue.offer(task);
+
+            // 如果当前没有下载任务在执行，则开始下载
+            if (!isDownloadRunning) {
+                processNextDownload();
+            }
+        }
+    }
+
+    /**
+     * 处理下一个下载任务
+     */
+    private void processNextDownload() {
+        synchronized (downloadLock) {
+            if (downloadQueue.isEmpty()) {
+                isDownloadRunning = false;
+                return;
+            }
+
+            isDownloadRunning = true;
+            DownloadTask currentTask = downloadQueue.poll();
+
+            // 执行下载任务
+            new DownloadAsyncTask(currentTask.callback).execute(currentTask.url);
+        }
+    }
+
+    /**
+     * 异步下载任务
+     */
+    private class DownloadAsyncTask extends AsyncTask<String, Void, String> {
+        private DownloadCallback callback;
+        private String errorMessage;
+
+        public DownloadAsyncTask(DownloadCallback callback) {
+            this.callback = callback;
+        }
+
+        @Override
+        protected String doInBackground(String... urls) {
+            String url = urls[0];
+            try {
+                // 获取文件名
+                int lastSlashIndex = url.lastIndexOf('/');
+                String fileName = lastSlashIndex != -1 ? url.substring(lastSlashIndex + 1) : url;
+                int queryIndex = fileName.indexOf("?");
+                if (queryIndex != -1) {
+                    fileName = fileName.substring(0, queryIndex);
+                }
+
+                // 创建本地文件
+                File dir = new File(getContext().getCacheDir(), "animations");
+                if (!dir.exists()) {
+                    dir.mkdirs();
+                }
+                File file = new File(dir, fileName);
+
+                // 如果文件已存在，直接返回本地路径
+                if (file.exists()) {
+                    return file.getAbsolutePath();
+                }
+
+                // 下载文件
+                HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
+                connection.connect();
+
+                if (connection.getResponseCode() != HttpURLConnection.HTTP_OK) {
+                    errorMessage = "服务器返回HTTP错误代码: " + connection.getResponseCode();
+                    return null;
+                }
+
+                InputStream input = connection.getInputStream();
+                FileOutputStream output = new FileOutputStream(file);
+
+                byte[] buffer = new byte[4096];
+                int bytesRead;
+                while ((bytesRead = input.read(buffer)) != -1) {
+                    output.write(buffer, 0, bytesRead);
+                }
+
+                output.close();
+                input.close();
+                connection.disconnect();
+
+                return file.getAbsolutePath();
+            } catch (IOException e) {
+                errorMessage = "下载失败: " + e.getMessage();
+                return null;
+            }
+        }
+
+        @Override
+        protected void onPostExecute(String result) {
+            synchronized (downloadLock) {
+                // 下载完成，处理下一个下载任务
+                processNextDownload();
+            }
+
+            // 通知回调
+            if (callback != null) {
+                if (result != null) {
+                    callback.onSuccess(result);
+                } else {
+                    callback.onError(errorMessage != null ? errorMessage : "未知错误");
+                }
+            }
+        }
+    }
+
+    /**
+     * 下载任务类
+     */
+    private static class DownloadTask {
+        String url;
+        DownloadCallback callback;
+
+        DownloadTask(String url, DownloadCallback callback) {
+            this.url = url;
+            this.callback = callback;
+        }
+    }
+
+    /**
+     * 下载回调接口
+     */
+    private interface DownloadCallback {
+        void onSuccess(String localPath);
+
+        void onError(String error);
+    }
+
+    /**
+     * 获取文件扩展名
+     *
+     * @param url 文件URL
+     * @return 文件扩展名
+     */
+    private String getFileExtension(String url) {
+        if (url != null && url.contains(".")) {
+            return url.substring(url.lastIndexOf(".") + 1);
+        }
+        return "";
+    }
+
+    /**
+     * 销毁特效视图
+     */
+    public void destroyEffectView() {
+        // 停止头像动画
+        stopAvatarAnimation();
+
+        // 清理监听器
+        clearPlaybackCompleteListeners();
+
+        // 停止动画视图但保留组件以便重用
+        if (anim_cp != null) {
+            anim_cp.stopPlay();
+            anim_cp.setVisibility(View.GONE);
+        }
+
+        // 隐藏视图但不移除，以便再次使用
+        setVisibility(View.GONE);
+
+        // 清空动画队列
+        lock.lock();
+        try {
+            animationArray.clear();
+            isLoadEffect = false;
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    /**
+     * 从底部弹起动画
+     */
+    private void startBottomUpAnimation() {
+        // 获取父视图的高度，如果为0则使用屏幕高度
+        float parentHeight = 0;
+        if (getParent() != null) {
+            parentHeight = ((View) getParent()).getHeight();
+        }
+        if (parentHeight <= 0) {
+            parentHeight = getResources().getDisplayMetrics().heightPixels;
+        }
+
+        // 设置初始位置在屏幕底部外
+//        setTranslationY(parentHeight);
+
+        // 创建从底部弹起的动画
+        TranslateAnimation bottomUpAnimation = new TranslateAnimation(
+                Animation.ABSOLUTE, 0, Animation.ABSOLUTE, 0,
+                Animation.RELATIVE_TO_PARENT, 1.0f, Animation.RELATIVE_TO_PARENT, 0.0f);
+        bottomUpAnimation.setDuration(2000); // 动画持续时间
+
+        // 创建弹性插值器
+        Interpolator overshootInterpolator = new OvershootInterpolator(0.5f);
+        bottomUpAnimation.setInterpolator(overshootInterpolator);
+
+        // 应用动画
+        startAnimation(bottomUpAnimation);
+
+        // 动画结束后重置位置
+        bottomUpAnimation.setAnimationListener(new Animation.AnimationListener() {
+            @Override
+            public void onAnimationStart(Animation animation) {
+                setVisibility(View.VISIBLE);
+                anim_cp.setVisibility(View.VISIBLE);
+                avatarContainer1.setVisibility(VISIBLE);
+
+                anim_cp.startPlay(new File(currPlayPath));
+            }
+
+            @Override
+            public void onAnimationEnd(Animation animation) {
+                startAvatarFloatAnimation();
+            }
+
+            @Override
+            public void onAnimationRepeat(Animation animation) {
+            }
+        });
+        avatarsParentContainer.startAnimation(bottomUpAnimation);
+    }
+
+    /**
+     * 头像上下动画
+     */
+    private void startAvatarFloatAnimation() {
+        // 确保包含两个头像的父布局已初始化
+        if (avatarsParentContainer == null) {
+            return;
+        }
+
+        // 包含两个头像的父布局上下浮动动画
+        AnimationSet avatarsAnimationSet = new AnimationSet(true);
+        // 使用适中的移动距离，确保头像框显示完整
+        TranslateAnimation avatarsFloatUp = new TranslateAnimation(
+                Animation.RELATIVE_TO_SELF, 0.0f, Animation.RELATIVE_TO_SELF, 0.0f,
+                Animation.RELATIVE_TO_SELF, 0.0f, Animation.RELATIVE_TO_SELF, -0.01f);
+        avatarsFloatUp.setDuration(900); // 增加动画持续时间，使动画更平滑
+        avatarsFloatUp.setRepeatCount(Animation.INFINITE);
+        avatarsFloatUp.setRepeatMode(Animation.REVERSE);
+
+        avatarsAnimationSet.addAnimation(avatarsFloatUp);
+        avatarsParentContainer.startAnimation(avatarsAnimationSet);
+
+    }
+
+    /**
+     * 停止头像动画
+     */
+    private void stopAvatarAnimation() {
+        if (avatarsParentContainer != null) {
+            avatarsParentContainer.clearAnimation();
+        }
+    }
+
+    /**
+     * 停止播放动画
+     */
+    public void stopPlay() {
+        stopAvatarAnimation();
+        if (anim_cp != null) {
+            anim_cp.stopPlay();
+            anim_cp.setVisibility(View.GONE);
+        }
+        setVisibility(View.GONE);
+    }
+
+    /**
+     * 开启或关闭特效视图
+     *
+     * @param isShow 是否显示
+     */
+    public void openOrCloseEffectViewWith(boolean isShow) {
+        this.isShow = isShow;
+
+        if (anim_cp != null) {
+            anim_cp.stopPlay();
+            anim_cp.setVisibility(View.GONE);
+        }
+        setVisibility(isShow ? View.VISIBLE : View.GONE);
+    }
+
+    /**
+     * 下载并播放动画
+     *
+     * @param context   上下文
+     * @param playImage 动画URL
+     * @param callback  下载回调
+     */
+    public void downloadAndPlay(Context context, String playImage, DownloadCallback callback) {
+        String fileName = playImage.substring(playImage.lastIndexOf("/"));
+        String filePath = context.getCacheDir().getAbsolutePath() + fileName;
+
+        LogUtils.e("@@@@@filePath: " + filePath.toString());
+
+        File file = new File(filePath);
+
+        if (!file.exists()) {
+            LogUtils.e("无缓存");
+            // 使用OkHttp进行下载
+            OkHttpClient client = new OkHttpClient();
+            Request request = new Request.Builder()
+                    .url(playImage)
+                    .build();
+
+            client.newCall(request).enqueue(new Callback() {
+                @Override
+                public void onFailure(Call call, IOException e) {
+                    LogUtils.e("MP4下载失败: " + e.toString());
+                    // 在主线程中回调失败
+                    post(() -> {
+                        if (callback != null) {
+                            callback.onError(e.getMessage());
+                        }
+                    });
+                }
+
+                @Override
+                public void onResponse(Call call, Response response) throws IOException {
+                    if (response.isSuccessful()) {
+                        try (ResponseBody responseBody = response.body()) {
+                            if (responseBody != null) {
+                                File downloadedFile = new File(filePath);
+                                FileOutputStream fos = new FileOutputStream(downloadedFile);
+                                fos.write(responseBody.bytes());
+                                fos.close();
+
+                                // 在主线程中回调成功
+                                post(() -> {
+                                    if (callback != null) {
+                                        callback.onSuccess(downloadedFile.getAbsolutePath());
+                                    }
+                                });
+                            } else {
+                                // 在主线程中回调失败
+                                post(() -> {
+                                    if (callback != null) {
+                                        callback.onError("Response body is null");
+                                    }
+                                });
+                            }
+                        } catch (Exception e) {
+                            LogUtils.e("MP4文件保存失败: " + e.getMessage());
+                            // 在主线程中回调失败
+                            post(() -> {
+                                if (callback != null) {
+                                    callback.onError(e.getMessage());
+                                }
+                            });
+                        }
+                    } else {
+                        LogUtils.e("MP4下载响应失败");
+                        // 在主线程中回调失败
+                        post(() -> {
+                            if (callback != null) {
+                                callback.onError("Response not successful: " + response.code());
+                            }
+                        });
+                    }
+                }
+            });
+        } else {
+            // 文件已存在，直接回调成功
+            if (callback != null) {
+                callback.onSuccess(file.getAbsolutePath());
+            }
+        }
+    }
+
+    /**
+     * 重新初始化视图，以便再次播放
+     */
+    public void reinitView() {
+        if (anim_cp == null) {
+            // 如果动画视图已被销毁，重新初始化
+            initView();
+
+            // 重新设置动画监听器
+            setupAnimListener();
+        }
+
+        // 确保线程池可用
+        if (queue == null || queue.isShutdown()) {
+            queue = Executors.newSingleThreadExecutor();
+        }
+
+        // 重置状态
+        isLoadEffect = false;
+        isShow = true;
+    }
+
+    /**
+     * 完全销毁视图，释放所有资源
+     * 当不再需要此视图时调用
+     */
+    public void completeDestroy() {
+        // 停止头像动画
+        stopAvatarAnimation();
+
+        // 清理监听器
+        clearPlaybackCompleteListeners();
+
+        // 停止并移除动画视图
+        if (anim_cp != null) {
+            anim_cp.stopPlay();
+            removeView(anim_cp);
+            anim_cp = null;
+        }
+
+        // 停止线程池
+        if (queue != null) {
+            queue.shutdown();
+            queue = null;
+        }
+
+        // 隐藏并移除整个视图
+        setVisibility(View.GONE);
+        if (getParent() != null) {
+            ((ViewGroup) getParent()).removeView(this);
+        }
+    }
+
+}

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

@@ -7,6 +7,7 @@ import android.os.Looper;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.SoundEffectConstants;
 import android.view.View;
 import android.widget.FrameLayout;
 
@@ -57,6 +58,12 @@ import okhttp3.ResponseBody;
 
 public class AvatarFrameView extends FrameLayout {
     private PlaybackManager playbackManager;
+
+    private boolean isMute = false;
+    public void setMute(boolean b) {
+        this.isMute = b;
+    }
+
     public enum RenderType {SVGA, MP4}
 
     private RenderType renderType;
@@ -113,49 +120,6 @@ public class AvatarFrameView extends FrameLayout {
         // 初始化播放管理器
         playbackManager = new PlaybackManager(mainHandler);
 
-        // 获取 MP4PlaybackCallback 单例实例并设置引用
-//        MP4PlaybackCallback callback = MP4PlaybackCallback.getInstance();
-//        callback.setAvatarFrameView(this);
-        // 设置播放完成监听
-//        mBinding.playView.setAnimListener(callback);
-
-//        if (mBinding != null) {
-//            mBinding.playView.setAnimListener(this);
-//        }
-
-//        MP4PlaybackCallback = new IAnimListener() {
-//            @Override
-//            public boolean onVideoConfigReady(@NonNull AnimConfig animConfig) {
-//                return false;
-//            }
-//
-//            @Override
-//            public void onVideoStart() {
-//
-//            }
-//
-//            @Override
-//            public void onVideoRender(int i, @Nullable AnimConfig animConfig) {
-//
-//            }
-//
-//            @Override
-//            public void onVideoComplete() {
-//                onPlaybackComplete();
-//            }
-//
-//            @Override
-//            public void onVideoDestroy() {
-//
-//            }
-//
-//            @Override
-//            public void onFailed(int i, @Nullable String s) {
-//                onPlaybackComplete();
-//            }
-//        };
-//        // 设置播放完成监听
-//        mBinding.playView.setAnimListener(MP4PlaybackCallback);
     }
 
     private String getFileExtension(String url) {
@@ -458,6 +422,7 @@ public class AvatarFrameView extends FrameLayout {
             mainHandler.post(() -> {
                 // 检查是否已销毁
                 if (file.exists()) {
+                    LogUtils.e("有缓存:"+file.exists()+"===="+file.getAbsolutePath());
                     playMp4File(file);
                 } else {
                     LogUtils.w(TAG, "有缓存2222222222222");
@@ -488,7 +453,7 @@ public class AvatarFrameView extends FrameLayout {
                 } else {
                     mBinding.playView.setLoop(1); // 播放一次
                 }
-
+                 mBinding.playView.setMute(isMute);
                 // 开始播放前检查视图状态
                 if (!isDestroyed && mBinding != null && mBinding.playView != null) {
                     mBinding.playView.startPlay(file);

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

@@ -92,6 +92,7 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
 
     private final SVGAParser parser = new SVGAParser(CommonAppContext.getInstance());
 
+    public boolean isMentorShip = false;
 
     public BaseWheatView(Context context) {
         this(context, null, 0);
@@ -158,6 +159,9 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
         }
     }
 
+    public void isMentorShip(boolean isMentorShip) {
+        this.isMentorShip = isMentorShip;
+    }
 
     /**
      * 设置麦位数据
@@ -175,11 +179,15 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
         setCardiac(pitBean.getCharm(), getTzbl());
 
         if (bean.getUser_id() != null && !bean.getUser_id().equals("0") && !bean.getUser_id().isEmpty()) {
-            if (CommonAppContext.getInstance().getOnlineMap() != null && CommonAppContext.getInstance().getOnlineMap().get(bean.getUser_id()) != null) {
+          if (bean.getIs_online()==1){
-                iv_on_line.setVisibility(CommonAppContext.getInstance().getOnlineMap().get(bean.getUser_id()) == 1 ? GONE : VISIBLE);
+              iv_on_line.setVisibility(GONE);
-            } else {
+          }else if (bean.getIs_online()==2){
-                iv_on_line.setVisibility(GONE);
+              if (!bean.getUser_id().equals(SpUtil.getUserId()+"")) {
-            }
+                  iv_on_line.setVisibility(VISIBLE);
+              }
+          }else {
+              iv_on_line.setVisibility(GONE);
+          }
         } else {
             iv_on_line.setVisibility(GONE);
         }
@@ -201,52 +209,56 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
 
         setPitData(bean);
 
-        //心动值
-        //显示心动
-        if ("1".equals(pitBean.getShutup())) {
-            mIvShutup.setVisibility(VISIBLE);
-        } else {
-            mIvShutup.setVisibility(GONE);
-        }
-
         //自动调节麦位波纹
         if (mIvRipple != null) {
             mIvRipple.setScaleX(1.1f);
             mIvRipple.setScaleY(1.1f);
         }
-        if (pitNumber.equals("9")) {
+        if (!isMentorShip){
-            iv_tag_type.setImageResource(R.mipmap.zc);
+
-            if (mRiv.getLayoutParams() instanceof ConstraintLayout.LayoutParams) {
+            //心动值
-                ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) mRiv.getLayoutParams();
+            //显示心动
-                params.matchConstraintPercentWidth = 0.66f; // 设置为 52%
+            if ("1".equals(pitBean.getShutup())) {
-                params.width = 0; // 必须设为 0dp（MATCH_CONSTRAINT）
+                mIvShutup.setVisibility(VISIBLE);
-                mRiv.setLayoutParams(params);
+            } else {
+                mIvShutup.setVisibility(GONE);
             }
-        } else if (pitNumber.equals("10")) {
+
-            iv_tag_type.setImageResource(R.mipmap.jb);
+            if (pitNumber.equals("9")) {
-            if (mRiv.getLayoutParams() instanceof ConstraintLayout.LayoutParams) {
+                iv_tag_type.setImageResource(R.mipmap.zc);
-                ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) mRiv.getLayoutParams();
+                if (mRiv.getLayoutParams() instanceof ConstraintLayout.LayoutParams) {
-                params.matchConstraintPercentWidth = 0.66f; // 设置为 52%
+                    ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) mRiv.getLayoutParams();
-                params.width = 0; // 必须设为 0dp（MATCH_CONSTRAINT）
+                    params.matchConstraintPercentWidth = 0.66f; // 设置为 52%
-                mRiv.setLayoutParams(params);
+                    params.width = 0; // 必须设为 0dp（MATCH_CONSTRAINT）
+                    mRiv.setLayoutParams(params);
+                }
+            } else if (pitNumber.equals("10")) {
+                iv_tag_type.setImageResource(R.mipmap.jb);
+                if (mRiv.getLayoutParams() instanceof ConstraintLayout.LayoutParams) {
+                    ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) mRiv.getLayoutParams();
+                    params.matchConstraintPercentWidth = 0.66f; // 设置为 52%
+                    params.width = 0; // 必须设为 0dp（MATCH_CONSTRAINT）
+                    mRiv.setLayoutParams(params);
+                }
+            } else if (pitNumber.equals("-1")) {
+                iv_tag_type.setImageResource(R.mipmap.mu_yc);
+                if (mRiv.getLayoutParams() instanceof ConstraintLayout.LayoutParams) {
+                    ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) mRiv.getLayoutParams();
+                    params.matchConstraintPercentWidth = 0.66f; // 设置为 52%
+                    params.width = 0; // 必须设为 0dp（MATCH_CONSTRAINT）
+                    mRiv.setLayoutParams(params);
+                }
+            } else if (pitNumber.equals("0")) {
+                iv_tag_type.setVisibility(GONE);
+                mIvShutup.setVisibility(VISIBLE);
+            } else if (pitNumber.equals("888")) {
+                iv_tag_type.setVisibility(GONE);
+                mIvShutup.setVisibility(GONE);
+            } else {
+                iv_tag_type.setVisibility(GONE);
             }
-        } else if (pitNumber.equals("-1")) {
-            iv_tag_type.setImageResource(R.mipmap.mu_yc);
-            if (mRiv.getLayoutParams() instanceof ConstraintLayout.LayoutParams) {
-                ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) mRiv.getLayoutParams();
-                params.matchConstraintPercentWidth = 0.66f; // 设置为 52%
-                params.width = 0; // 必须设为 0dp（MATCH_CONSTRAINT）
-                mRiv.setLayoutParams(params);
-            }
-        } else if (pitNumber.equals("0")) {
-            iv_tag_type.setVisibility(GONE);
-            mIvShutup.setVisibility(VISIBLE);
-        } else if (pitNumber.equals("888")) {
-            iv_tag_type.setVisibility(GONE);
-            mIvShutup.setVisibility(GONE);
-        } else {
-            iv_tag_type.setVisibility(GONE);
         }
+
         AgoraManager.getInstance().addSoundLevelListener(new SoundLevelUpdateListener() {
             @Override
             public void onRemoteSoundLevelUpdate(String userId, int soundLevel) {
@@ -416,9 +428,13 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
 
     public void setOnlineStatus() {
         if (pitBean.getUser_id() != null && !pitBean.getUser_id().equals("0") && !pitBean.getUser_id().isEmpty()) {
-            if (CommonAppContext.getInstance().getOnlineMap() != null && CommonAppContext.getInstance().getOnlineMap().get(pitBean.getUser_id()) != null) {
+            if (pitBean.getIs_online()==1){
-                iv_on_line.setVisibility(CommonAppContext.getInstance().getOnlineMap().get(pitBean.getUser_id()) == 1 ? GONE : VISIBLE);
+                iv_on_line.setVisibility(GONE);
-            } else {
+            }else if (pitBean.getIs_online()==2){
+                if (!pitBean.getUser_id().equals(SpUtil.getUserId()+"")) {
+                    iv_on_line.setVisibility(VISIBLE);
+                }
+            }else {
                 iv_on_line.setVisibility(GONE);
             }
         } else {

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

@@ -260,6 +260,7 @@ public class Constants {
     public static final String GET_DECORATE = "/api/Decorate/user_decorate";//装扮详情
     public static final String SET_USER_DECORATE = "/api/Decorate/set_user_decorate";//用户装扮
     public static final String JOIN_ROOM = "/api/Room/join_room";//加入房间
+    public static final String TASK_JUMP_ROOM = "/api/Room/task_jump_room";//师徒任务 加入房间
 
     public static final String UPDATEPASSWORD = "/api/room/setRoomPassword";//更新房间秘密啊
     public static final String GET_ROOM_ONLINE = "/api/Room/room_online_list";//房间在线列表
@@ -278,6 +279,11 @@ public class Constants {
     public static final String POST_GRAB = "/api/Redpacket/grab";//抢红包
 
     public static final String GET_ROOM_GIFT = "/api/Room/room_give_gift";//直播间送礼
+    public static final String POST_CP_GIVE_GIFT = "/api/UserCp/cpGiveGift";//用户CP礼物回赠
+    public static final String GET_CP_ZONE = "/api/UserCp/cpZone";//心动空间
+    public static final String POST_MY_FAMILY = "/api/Family/myFamily";//我的家族
+    public static final String POST_MY_JOIN_FAMILY = "/api/Family/myJoinFamily";//我加入的家族
+    public static final String POST_FAMILY_EARNINGS = "/api/Family/familyEarnings";//家族收益详情
     public static final String GET_ROOM_USER = "/api/Room/room_user_home";//房间内点击头像
     public static final String APPLY_PIT = "/api/RoomPit/apply_pit";//申请上麦
     public static final String DOWN_PIT = "/api/RoomPit/down_pit";//下麦
@@ -330,6 +336,7 @@ public class Constants {
     public static final String POST_AUCTION_MODE = "/api/RoomAuction/room_auction_mode";//修改房间竞拍模式
     public static final String POST_ROOM_AUCTION_LIST = "/api/RoomAuction/room_auction_list";//房间竞拍列表
     public static final String GET_MY_CP_ROOM_LIST = "/api/Room/my_cp_room";//我的Cp房
+    public static final String CHECK_CREATE_ROOM = "/api/Room/check_create_room";//创建房间检测
     public static final String POST_SEARCH_PK_ROOM = "/api/RoomPk/search_pk_room";//搜索 或推荐的pk房间
     public static final String POST_SEND_PK = "/api/RoomPk/send_pk";//发起PK邀请
     public static final String ACCEPT_PK = "/api/RoomPk/accept_pk";//接受/拒绝 PK邀请
@@ -354,9 +361,11 @@ public class Constants {
     public static final String POST_ROOM_RANKING = "/api/Ranking/room_ranking";//房间榜
     public static final String GUILD_RANKING = "/api/Ranking/guild_ranking";//公会榜
     public static final String POST_LOVE_RANKING = "/api/Ranking/love_ranking";//真爱榜
-    public static final String GET_TASKS_LIHEN = "/api/Dailytasks/dailyTasksList";//每日任务列表
+    public static final String GET_TASKS_LIHEN = "/api/Tasks/dailyTasksList";//每日任务列表
-    public static final String GET_DAILY_TASK_BOX = "/api/Dailytasks/dailyTasksBoxRecord";//礼盒记录
+    public static final String GET_DAILY_TASK_BOX = "/api/Tasks/dailyTasksBoxRecord";//礼盒记录
-    public static final String dailyTasksOpenBox = "/api/Dailytasks/dailyTasksOpenBox";//开启礼盒
+    public static final String dailyTasksOpenBox = "/api/Tasks/dailyTasksOpenBox";//开启礼盒
+    public static final String dailyTasksReceive = "/api/Tasks/dailyTasksReceive";//领取每日任务奖励
+    public static final String dailyTasksComplete = "/api/Tasks/dailyTasksComplete";//领取每日任务奖励
     public static final String GET_MY_BAG_DATA = "/api/UserGiftPack/get_gift_pack_income";//背包收入
     public static final String GET_MY_BAG_OUTCOME = "/api/UserGiftPack/get_gift_pack_outcome";//背包礼物支出列表
     public static final String GET_GIFT_PACK = "/api/UserGiftPack/get_gift_pack_list";//获取背包礼物列表
@@ -365,6 +374,7 @@ public class Constants {
     public static final String GET_APP_UPDATE = "/api/Version/get_app_version";//版本更新
     public static final String POST_CLEAR_USER_CHARM = "/api/Room/clear_user_charm";//清除魅力值
     public static final String POST_MESSAGE_LIST = "/api/UserMessage/get_user_message_list";//消息列表
+    public static final String POST_INVITE = "/api/Guild/invite_apply_handle";//【新】受邀申请处理
     public static final String POST_BIND_DETAIL = "/api/Bind/bind_detail";//绑定详情
     public static final String POST_USER_WALL = "/api/User/user_gift_wall";//礼物墙
     public static final String POST_USER_OLINE_STATUS = "/api/Room/user_online_status";//用户在线状态
@@ -377,15 +387,14 @@ public class Constants {
     public static final String GET_FIRST_CHARGE_GIFT = "/api/Activities/first_charge_gift";//首充好礼列表接口
     public static final String GET_NEW_CHARGE_GIFT = "/api/Activities/new_charge_gift";//新人好礼列表接口（弹框）
     public static final String GET_ACTIVITIES_PERMISSION = "/api/Activities/activities_permission";//活动弹框权限
+    public static final String GET_INDEX_RECOMMEND_ROOM = "/api/Index/index_recommend_room";//首页弹窗推荐房间
     public static final String GET_DAY_DROP_GIFT = "/api/Activities/day_drop_gift";//天降好礼列表接口（弹框）
-    public static final String dailyTasksReceive = "/api/Dailytasks/dailyTasksReceive";//领取每日任务奖励
     public static final String postRoomSwToken = "/api/Room/update_user_sw_token";//获取用户声网token
-    public static final String dailyTasksComplete = "/api/Dailytasks/dailyTasksComplete";//领取每日任务奖励
     public static final String POST_CANCEL_USER_DECORATE = "/api/Decorate/cancel_user_decorate";//取消装扮
     public static final String GET_THEME_DATA = "/api/Theme/get_theme_data";//主题接口
     public static final String START_FRIEND = "/api/Friend/start_friend";//点击开始按钮 交友房
     public static final String DELAY = "/api/Friend/delay";//点击延时 交友房
-    public static final String POST_KEEP_XINTIAO = "/api/Xintiao/keep_xintiao";//心跳
+    public static final String POST_KEEP_XINTIAO = "/api/Xintiao/keep_room_heartbeat";//心跳
     public static final String END_FRIEND = "/api/Friend/end_friend";//点击结束 交友房
     public static final String CREATE_RELATION = "/api/Friend/create_relation";//卡关系 （创建关系） 交友房
     public static final String GET_BOX_GIFT_LIST = "/api/BlindBoxTurntable/get_gift_list";//获取活动礼物列表
@@ -411,7 +420,26 @@ public class Constants {
     public static final String GET_NOBILITY_DETAIL = "/api/Nobility/get_nobility_detail";//爵位详情
     public static final String GET_NOBILITY_LIST = "/api/Nobility/get_nobility_list";//爵位列表
     public static final String GET_NOBILITY_PRICE = "/api/Nobility/get_nobility_price";//爵位购买价格
+    public static final String POST_SINGER_AUTH = "/api/SingerSong/singerAuth";//歌手认证
+    public static final String POST_GET_SONG = "/api/SingerSong/getSong";//获取用户的歌单
+    public static final String POST_SINGER_SONG = "/api/SingerSong/singerSong";//点歌
+    public static final String POST_SINGER_SONG_TOP = "/api/SingerSong/singerSongTop";//歌曲置顶
+    public static final String POST_SINGER_SONG_COUNT = "/api/SingerSong/singerSongCount";//点歌各类型各个总数
+    public static final String POST_SINGER_SONG_LIST = "/api/SingerSong/singerSongList";//点歌列表
+    public static final String POST_SINGER_SONG_CUT = "/api/SingerSong/singerSongCut";//切歌
+    public static final String POST_SINGER_ADD_SONG = "/api/SingerSong/singerAddSong";//歌手添加歌曲
+    public static final String POST_SINGER_DELETE_SONG = "/api/SingerSong/singerDelSong";//歌手删除 歌曲
+    public static final String POST_SINGER_UPDATE_SONG = "/api/SingerSong/singerEditSong";//歌手修改歌曲
+    public static final String POST_FRIEND_LIST = "/api/User/get_friend_list";//挚友列表
+    public static final String POST_FRIEND_LIST_MORE = "/api/User/get_friend_list_more";//挚友列表查看更多
     public static final String POST_SEND_LOG = "api/Report/android_log_report";//上传log信息
+    public static final String GET_SKILL_LIST = "/api/Sign/skill_list";//才艺列表
+    public static final String POST_FREE_RE_SIGN = "/api/Sign/free_re_sign";//免费续约
+    public static final String POST_RE_SIGN = "/api/Sign/re_sign";//续签（花金币）
+    public static final String POST_SIGN_REFUSE = "/api/RoomPit/refuse_sign_room_host_invite";//签约房间主持邀请上签约麦用户拒绝
+    public static final String GET_SIGN_IN_LIST = "/api/Tasks/dailyTasksSignList";//签到列表页面
+    public static final String POST_DAILY_TASKS_SIGN = "/api/Tasks/dailyTasksSign";//每日签到
+    public static final String POST_DAILY_TASKS_SIGN_STATUS = "/api/Tasks/dailyTasksSignStatus";//每日签到状态
 
 
 
@@ -419,6 +447,12 @@ public class Constants {
     public static final String BIND_MOBILE = "/api/UserData/bind_mobile";//手机绑定
 
 
+    public static final String POST_SIGN_START = "/api/Sign/start_sign";//签约开始
+    public static final String POST_SIGN_END = "/api/Sign/end_sign";//签约结束
+    public static final String POST_SIGN_DELAY = "/api/Sign/sign_delay";//签约延时
+    public static final String POST_SIGN_COIN_LIST = "/api/Sign/sign_coin_list";//签约出价价格列表
+    public static final String POST_SIGN_COIN = "/api/Sign/sign_coin";//签约出价
+
 
 
 }

BaseModule/src/main/java/com/xscm/moduleutil/widget/CustomViewPager.kt

@@ -0,0 +1,66 @@
+package com.xscm.moduleutil.widget
+import android.content.Context
+import android.util.AttributeSet
+import android.view.MotionEvent
+import androidx.viewpager.widget.ViewPager
+/**
+ * 项目名称：羽声语音
+ * 时间：2025/12/3 9:30
+ * 用途：
+ */
+
+
+class CustomViewPager(context: Context, attrs: AttributeSet?) : ViewPager(context, attrs) {
+
+    private var initialX = 0f
+    private var initialY = 0f
+
+    private var isBeingDragged = false
+
+    override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {
+        when (ev.action) {
+            MotionEvent.ACTION_DOWN -> {
+                // 记录初始触摸点
+                initialX = ev.x
+                initialY = ev.y
+                parent.requestDisallowInterceptTouchEvent(true) // 请求父容器不要拦截事件
+            }
+            MotionEvent.ACTION_MOVE -> {
+                val deltaX = Math.abs(ev.x - initialX)
+                val deltaY = Math.abs(ev.y - initialY)
+
+                // 如果水平滑动距离大于垂直滑动距离，才认为是水平滑动，ViewPager才拦截事件
+                if (deltaX > deltaY && deltaX > 30) { // 30是阈值，可以根据需要调整
+                    return super.onInterceptTouchEvent(ev)
+                }
+
+                // 如果是向上滑动，确保父容器不拦截
+                if (deltaY > deltaX && ev.y < initialY) {
+                    parent.requestDisallowInterceptTouchEvent(true)
+                    return false
+                }
+//                // 否则，不拦截，让子视图处理
+//                parent.requestDisallowInterceptTouchEvent(true)
+//                return false
+            }
+            MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
+                isBeingDragged = false
+            }
+        }
+        return super.onInterceptTouchEvent(ev)
+    }
+
+    override fun onTouchEvent(ev: MotionEvent): Boolean {
+        when (ev.action) {
+            MotionEvent.ACTION_DOWN -> {
+                parent.requestDisallowInterceptTouchEvent(true)
+            }
+            MotionEvent.ACTION_MOVE -> {
+                if (isBeingDragged) {
+                    parent.requestDisallowInterceptTouchEvent(true)
+                }
+            }
+        }
+        return super.onTouchEvent(ev)
+    }
+}

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

@@ -10,11 +10,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.blankj.utilcode.util.LogUtils;
-import com.opensource.svgaplayer.SVGACallback;
-import com.opensource.svgaplayer.SVGADrawable;
-import com.opensource.svgaplayer.SVGAImageView;
-import com.opensource.svgaplayer.SVGAParser;
-import com.opensource.svgaplayer.SVGAVideoEntity;
 import com.tencent.qgame.animplayer.AnimConfig;
 import com.tencent.qgame.animplayer.AnimView;
 import com.tencent.qgame.animplayer.inter.IAnimListener;
@@ -23,14 +18,12 @@ import com.xscm.moduleutil.bean.GiftBean;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.locks.ReentrantLock;
 
+import lombok.Setter;
 import okhttp3.Call;
 import okhttp3.Callback;
 import okhttp3.OkHttpClient;
@@ -46,7 +39,8 @@ public class GiftAnimView extends FrameLayout implements GiftSvgaView.OnAnimatio
     private boolean isShow = true;//是否开启特效
     private ReentrantLock lock = new ReentrantLock();
     private List<String> giftArray = new ArrayList<>();
-    public ExecutorService queue = Executors.newSingleThreadExecutor();
+    @Setter
+    public ExecutorService queue;
     private Context mContext;
     private boolean isOnece;
     // 添加带Context参数的构造函数
@@ -64,9 +58,6 @@ public class GiftAnimView extends FrameLayout implements GiftSvgaView.OnAnimatio
         this.mContext = context;
         init();
     }
-    public void setQueue(ExecutorService queue) {
-        this.queue = queue;
-    }
 
     public GiftAnimView(Context context) {
         super(context);
@@ -76,13 +67,11 @@ public class GiftAnimView extends FrameLayout implements GiftSvgaView.OnAnimatio
 
     private void init() {
         isLoadEffect = false;
-
+//        setBackgroundColor(getResources().getColor(R.color.colorBlack45));
         // 初始化SVGA视图
         svgaView = new GiftSvgaView(getContext());
         addView(svgaView);
-
         playerMp4View = new AnimView(getContext());
-
         addView(playerMp4View);
 
         // 设置布局参数 - 在Android中通常使用LayoutParams
@@ -278,55 +267,52 @@ public class GiftAnimView extends FrameLayout implements GiftSvgaView.OnAnimatio
 
         if (isLoadEffect && giftModel != null && !TextUtils.isEmpty(giftModel)) {
            String  finalGiftModel = giftModel;
-            post(new Runnable() {
+            post(() -> {
-                @Override
+                String playImage = finalGiftModel;
-                public void run() {
+                if (playImage.endsWith("mp4")) {
-                    String playImage = finalGiftModel;
+                    downloadAndPlay(getContext(), playImage, new DownloadCallback() {
-                    if (playImage.endsWith("mp4")) {
+                        @Override
-                        downloadAndPlay(getContext(), playImage, new DownloadCallback() {
+                        public void onSuccess(File file) {
-                            @Override
+                            post(() -> {
-                            public void onSuccess(File file) {
+                                playerMp4View.setVisibility(View.VISIBLE);
-                                post(() -> {
+                                svgaView.setVisibility(View.GONE);
-                                    playerMp4View.setVisibility(View.VISIBLE);
+                                playerMp4View.startPlay(file);
-                                    svgaView.setVisibility(View.GONE);
+                            });
-                                    playerMp4View.startPlay(file);
-                                });
-                            }
-
-                            @Override
-                            public void onFailure(Exception e) {
-                                LogUtils.e("MP4下载或播放失败: " + e.getMessage());
-                                // 处理失败情况，继续播放下一个
-                                post(() -> {
-                                    lock.lock();
-                                    try {
-                                        isLoadEffect = false;
-                                    } finally {
-                                        lock.unlock();
-                                    }
-                                    loadStartSVGAPlayer();
-                                });
-                            }
-                        });
-                    } else if (playImage.endsWith("svga")) {
-//                        File file = downloadAndPlay(getContext(), playImage);
-                        post(() -> {
-                            playerMp4View.setVisibility(View.GONE);
-                            svgaView.setVisibility(View.VISIBLE);
-                            svgaView.loadSVGAPlayerWith(finalGiftModel, false);
-                        });
-                    } else {
-                        lock.lock();
-                        try {
-                            isLoadEffect = false;
-                        } finally {
-                            lock.unlock();
                         }
-                        loadStartSVGAPlayer();
-                        // 直接播放缓存文件
-                    }
 
+                        @Override
+                        public void onFailure(Exception e) {
+                            LogUtils.e("MP4下载或播放失败: " + e.getMessage());
+                            // 处理失败情况，继续播放下一个
+                            post(() -> {
+                                lock.lock();
+                                try {
+                                    isLoadEffect = false;
+                                } finally {
+                                    lock.unlock();
+                                }
+                                loadStartSVGAPlayer();
+                            });
+                        }
+                    });
+                } else if (playImage.endsWith("svga")) {
+//                        File file = downloadAndPlay(getContext(), playImage);
+                    post(() -> {
+                        playerMp4View.setVisibility(View.GONE);
+                        svgaView.setVisibility(View.VISIBLE);
+                        svgaView.loadSVGAPlayerWith(finalGiftModel, false);
+                    });
+                } else {
+                    lock.lock();
+                    try {
+                        isLoadEffect = false;
+                    } finally {
+                        lock.unlock();
+                    }
+                    loadStartSVGAPlayer();
+                    // 直接播放缓存文件
                 }
+
             });
         }
     }

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

@@ -6,6 +6,7 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import com.xscm.moduleutil.bean.GiftBean;
+import com.xscm.moduleutil.utils.roomview.RoomCPView;
 
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -20,6 +21,8 @@ public class QXGiftPlayerManager {
 
     private GiftAnimView fullEffectView;
     private GiftAnimView chatEffectView;
+
+    private RoomCPView roomCPView;
     private Context context;
 
     private QXGiftPlayerManager(Context context) {
@@ -39,6 +42,15 @@ public class QXGiftPlayerManager {
         return bgEffectView;
     }
 
+    public RoomCPView getRoomCPView(){
+        if (roomCPView==null){
+            initRoomCPView();
+        }
+        return roomCPView;
+    }
+
+
+
     public GiftAnimView getDefaultFullEffectView() {
         if (fullEffectView == null) {
             initFullEffectView();
@@ -62,10 +74,25 @@ public class QXGiftPlayerManager {
         bgEffectView.setBackgroundColor(0x00000000);
         bgEffectView.setClickable(false); // userInteractionEnabled = NO
 
-        // 添加全屏特效视图和聊天特效视图
+        // 添加全屏特效视图、聊天特效视图和CP视图
         ((ViewGroup) bgEffectView).addView(getDefaultFullEffectView());
         ((ViewGroup) bgEffectView).addView(getDefaultChatEffectView());
+        ((ViewGroup) bgEffectView).addView(getRoomCPView());
     }
+
+    private void initRoomCPView() {
+        roomCPView=new RoomCPView(context);
+        roomCPView.setLayoutParams(new ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT
+        ));
+        // 创建专用线程池替代GCD队列
+        ExecutorService queue = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS,
+                new LinkedBlockingQueue<Runnable>(),
+                Executors.defaultThreadFactory());
+        roomCPView.setQueue(queue);
+    }
+
     public void displayFullEffectView(String gift) {
         getDefaultFullEffectView().displayEffectView(gift);
     }
@@ -78,6 +105,31 @@ public class QXGiftPlayerManager {
         getDefaultChatEffectView().displayEffectView(gift);
     }
 
+    /**
+     * 显示CP动画
+     * @param room_head1 头像1的URL
+     * @param room_head2 头像2的URL
+     * @param room_cp_name1 名称1
+     * @param room_cp_name2 名称2
+     * @param mp4Path MP4动画文件路径
+     */
+    public void displayCPView(String room_head1, String room_head2, String room_cp_name1, String room_cp_name2, String mp4Path) {
+        getRoomCPView().displayEffectView(room_head1, room_head2, room_cp_name1, room_cp_name2, mp4Path);
+    }
+
+    /**
+     * 开启或关闭CP动画
+     * @param isShow 是否显示
+     */
+    public void openOrCloseCPViewWith(boolean isShow) {
+    }
+
+    /**
+     * 停止CP动画
+     */
+    public void stopCPPlay() {
+    }
+
 
 
     public void openOrCloseEffectViewWith(boolean isShow) {
@@ -102,6 +154,15 @@ public class QXGiftPlayerManager {
             chatEffectView = null;
         }
 
+        if (roomCPView != null) {
+            // 先调用destroyEffectView方法，它会自动从父视图中移除
+            roomCPView.destroyEffectView();
+            if (bgEffectView != null) {
+                ((ViewGroup) bgEffectView).removeView(roomCPView);
+            }
+            roomCPView = null;
+        }
+
         if (bgEffectView != null) {
             bgEffectView = null;
         }
@@ -114,6 +175,8 @@ public class QXGiftPlayerManager {
         if (chatEffectView != null) {
             chatEffectView.stopPlay();
         }
+        if (roomCPView != null) {
+        }
     }
 
     private void initFullEffectView() {

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

@@ -74,7 +74,7 @@ public class RoomSingSongWheat2View extends BaseWheatView {
         updateSexIcon();
 //        updateCharmViewVisibility(bean);
         updatePkState(bean);
-        iv_on_line.setVisibility(GONE);
+//        iv_on_line.setVisibility(GONE);
     }
 
     private void handleOnState(RoomPitBean bean) {

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

@@ -71,7 +71,7 @@ public class RoomSingSongWheatView extends BaseWheatView {
 
         updateSexIcon();
         updatePkState(bean);
-        iv_on_line.setVisibility(GONE);
+//        iv_on_line.setVisibility(GONE);
     }
 
     private void handleOnState(RoomPitBean bean) {

BaseModule/src/main/java/com/xscm/moduleutil/widget/ShineTextView.kt

@@ -29,15 +29,15 @@ class ShineTextView : AppCompatTextView {
     //流光效果下字体流动次数
      var shineCount: Int = Int.MAX_VALUE
     //注入效果 开始，中间，结束
-     var startColor: Int = Color.WHITE
+     var startColor: Int = Color.BLACK
-     var shineColor: Int = Color.WHITE
+     var shineColor: Int = Color.BLACK
-     var endColor: Int = Color.WHITE
+     var endColor: Int = Color.BLACK
     //一次动效时长
-     var shineDuration: Int = 400
+     var shineDuration: Int = 1000
 
      var _count: Int = 0 //自行运行动画次数
 
-    private lateinit var mLinearGradient: LinearGradient
+    private  var mLinearGradient: LinearGradient? = null
     private var mGradientMatrix: Matrix = Matrix()
     private var mViewWidth = 0
     private var mTranslate = 0
@@ -77,7 +77,7 @@ class ShineTextView : AppCompatTextView {
                     mLinearGradient = LinearGradient(
                         0f,
                         0f,
-                        (mViewWidth / 4).toFloat(),
+                        (mViewWidth / 1).toFloat(),
                         0f,
                         intArrayOf(currentTextColor, shineColor, currentTextColor),
                         null,
@@ -104,7 +104,7 @@ class ShineTextView : AppCompatTextView {
                 0f,
                 0f,
                 0f,
-                intArrayOf(Color.TRANSPARENT,Color.TRANSPARENT),
+                intArrayOf(Color.BLACK,Color.BLACK),
                 null,
                 Shader.TileMode.CLAMP
             )
@@ -121,13 +121,13 @@ class ShineTextView : AppCompatTextView {
             _count++
         }
         mGradientMatrix.setTranslate(mTranslate.toFloat(), 0f)
-        mLinearGradient.setLocalMatrix(mGradientMatrix)
+        mLinearGradient?.setLocalMatrix(mGradientMatrix)
         when {
             shineType == 0 && _count < shineCount -> postInvalidateDelayed(50)
             shineType == 1 && _count < 1 -> postInvalidateDelayed(50)
             else -> {
                 mGradientMatrix.setTranslate((1.2 * mViewWidth).toFloat(), 0f)
-                mLinearGradient.setLocalMatrix(mGradientMatrix)
+                mLinearGradient?.setLocalMatrix(mGradientMatrix)
             }
         }
     }

BaseModule/src/main/java/com/xscm/moduleutil/widget/dialog/CommentDialogFragment.java

@@ -101,6 +101,9 @@ public class CommentDialogFragment extends BaseMvpDialogFragment<CommentPresente
 
     @Override
     public void getCommentList(List<CircleListBean.LikeList> likeLists) {
+        if (likeLists == null){
+            return;
+        }
         mBinding.tvNum.setText("已有"+likeLists.size()+"人点赞");
         likeListAdapter.setNewData(likeLists);
     }

BaseModule/src/main/java/com/xscm/moduleutil/widget/dialog/RewardGiftDialogFragment.java

@@ -69,16 +69,18 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
     private String user_id;
     private String giftNumber = "";
     private int point;
+
     @Override
     protected RewardGiftPresenter bindPresenter() {
         return new RewardGiftPresenter(this, getActivity());
     }
-    public static void show(String id,String userId,int point, FragmentManager fragmentManager) {
+
+    public static void show(String id, String userId, int point, FragmentManager fragmentManager) {
         RewardGiftDialogFragment dialogFragment = new RewardGiftDialogFragment();
         Bundle args = new Bundle();
         args.putString("circle_id", id); // 可选：传递参数
         args.putString("user_id", userId);
-        args.putInt("point",point);
+        args.putInt("point", point);
         // 设置参数...
         dialogFragment.setArguments(args);
         dialogFragment.show(fragmentManager, "RewardGiftDialogFragment");
@@ -87,9 +89,9 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
     @Override
     public void onAttach(@NonNull Context context) {
         super.onAttach(context);
-        circle_id=getArguments().getString("circle_id");
+        circle_id = getArguments().getString("circle_id");
-        user_id=getArguments().getString("user_id");
+        user_id = getArguments().getString("user_id");
-        point=getArguments().getInt("point");
+        point = getArguments().getInt("point");
     }
 
     @Override
@@ -97,12 +99,13 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
         super.initDialogStyle(window);
         window.setGravity(Gravity.BOTTOM);
     }
+
     @Override
     protected void initData() {
         MvpPre.getRewardList(circle_id, 1, 10);
         MvpPre.getGiftLabel("1");
         MvpPre.wallet();
-        mGiftNumList=new ArrayList<>();
+        mGiftNumList = new ArrayList<>();
         mGiftNumList.add(new GiftNumBean("20", "x20"));
         mGiftNumList.add(new GiftNumBean("15", "x15"));
         mGiftNumList.add(new GiftNumBean("10", "x10"));
@@ -118,7 +121,7 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
             @Override
             protected void convert(BaseViewHolder helper, RewardUserBean item) {
                 GifAvatarOvalView gifAvatarOvalView = helper.getView(com.xscm.moduleutil.R.id.im_reward1);
-                if (item!=null ) {
+                if (item != null) {
                     ImageUtils.loadHeadCC(item.getAvatar(), helper.getView(com.xscm.moduleutil.R.id.im_reward1));
                 }
             }
@@ -130,13 +133,13 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
         mBinding.tvGive.setOnClickListener(this::onClisk);
 
         float[] corners = {0f, 65f, 65f, 0f};
-        ThemeableDrawableUtils.setThemeableRoundedBackground( mBinding.tvGive, ColorManager.getInstance().getPrimaryColorInt(), corners);
+        ThemeableDrawableUtils.setThemeableRoundedBackground(mBinding.tvGive, ColorManager.getInstance().getPrimaryColorInt(), corners);
         mBinding.tvGive.setTextColor(ColorManager.getInstance().getButtonColorInt());
         mBinding.cz.setTextColor(ColorManager.getInstance().getPrimaryColorInt());
     }
 
     private void onClisk(View view1) {
-        if (view1.getId()==R.id.tv_give_coin_num){
+        if (view1.getId() == R.id.tv_give_coin_num) {
             if (mSelectGiftNumPopupWindow == null) {
 
                 mSelectGiftNumPopupWindow = new SelectGiftNumPopupWindow(getSelfActivity(), (adapter, view, position) -> {
@@ -152,7 +155,7 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
                             }
                         });
                     } else {
-                        mBinding.tvGiveCoinNum.setText(giftNumBean.getNumber());
+                        mBinding.tvGiveCoinNum.setText(giftNumBean.getText());
                     }
                     mSelectGiftNumPopupWindow.dismiss();
                 });
@@ -160,12 +163,12 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
             mSelectGiftNumPopupWindow.setData(mGiftNumList);
             mSelectGiftNumPopupWindow.showAtLocation(mBinding.tvGiveCoinNum, Gravity.BOTTOM | Gravity.RIGHT, 100, 230);
 
-        }else if (view1.getId()== com.xscm.moduleutil.R.id.tv_reward_num){
+        } else if (view1.getId() == com.xscm.moduleutil.R.id.tv_reward_num) {
-            RewardDialogFragment.show(circle_id,getChildFragmentManager());
+            RewardDialogFragment.show(circle_id, getChildFragmentManager());
-        }else if (view1.getId()== R.id.cz){
+        } else if (view1.getId() == R.id.cz) {
-            RechargeDialogFragment.show("",null, getActivity().getSupportFragmentManager(),"0","0");
+            RechargeDialogFragment.show("", null, getActivity().getSupportFragmentManager(), "0", "0");
-        }else if (view1.getId()== R.id.tv_give){
+        } else if (view1.getId() == R.id.tv_give) {
-            for (int i=0;i<mGiftNumList.size();i++) {
+            for (int i = 0; i < mGiftNumList.size(); i++) {
                 if (mBinding.tvGiveCoinNum.getText().toString().equals(mGiftNumList.get(i).getText())) {
                     giftNumber = mGiftNumList.get(i).getNumber();
                 }
@@ -196,25 +199,24 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
             mBinding.tvRewardTitle.setVisibility(View.VISIBLE);
         }
     }
+
     private List<GiftLabelBean> giftLabelBeanList;
 
     @Override
     public void getGiftLabel(List<GiftLabelBean> giftLabelBeans) {
 
         if (giftLabelBeans == null) return;
-        if (SpUtil.getShelf()==1){
+        for (GiftLabelBean giftLabelBean1 : giftLabelBeans) {
-            for (GiftLabelBean giftLabelBean1 : giftLabelBeans){
+            if (giftLabelBean1.getId().equals("2")) {
-                if (giftLabelBean1.getId().equals("2")){
+                giftLabelBeans.remove(giftLabelBean1);
-                    giftLabelBeans.remove(giftLabelBean1);
+                break;
-                    break;
-                }
             }
         }
 
-        mBinding.viewPager.setAdapter(new MyFragmentPagerAdapter(getChildFragmentManager(), giftLabelBeans,fragmentList,""));
+        mBinding.viewPager.setAdapter(new MyFragmentPagerAdapter(getChildFragmentManager(), giftLabelBeans, fragmentList, ""));
         mBinding.slidingTabLayout.setViewPager(mBinding.viewPager);
         mBinding.slidingTabLayout.setCurrentTab(0);
-        refreshCurrentGiftFragment(giftLabelBeans.get(0).getId(),2,"");
+        refreshCurrentGiftFragment(giftLabelBeans.get(0).getId(), 2, "");
         mBinding.viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
             @Override
             public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
@@ -224,7 +226,7 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
             @Override
             public void onPageSelected(int position) {
                 // 当页面切换时，控制 tv_bb_qs 按钮的显示
-                refreshCurrentGiftFragment(giftLabelBeans.get(position).getId(),2,"");
+                refreshCurrentGiftFragment(giftLabelBeans.get(position).getId(), 2, "");
             }
 
             @Override
@@ -233,11 +235,13 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
             }
         });
     }
-    private void refreshCurrentGiftFragment(String id,int type,String roomId) {
+
-        if (getCurrentGiftFragment()!=null){
+    private void refreshCurrentGiftFragment(String id, int type, String roomId) {
-            getCurrentGiftFragment().loadDataIfNeeded(id,type,roomId);
+        if (getCurrentGiftFragment() != null) {
+            getCurrentGiftFragment().loadDataIfNeeded(id, type, roomId);
         }
     }
+
     private GiftTwoDetailsFragment getCurrentGiftFragment() {
         int currentPosition = mBinding.viewPager.getCurrentItem();
         // 使用 ViewPager 的 adapter 获取当前 fragment
@@ -251,10 +255,12 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
         }
         return null;
     }
+
     private int getSelectedGift() {
         int currentItem = mBinding.viewPager.getCurrentItem();
         return currentItem;
     }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void userRefresh(GiftUserRefreshEvent event) {
         if (event.addSelf) {
@@ -264,26 +270,27 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
 
     private void giveGift(String num) {
         getSelectedGift();
-            if (roonGiftModel == null) {
+        if (roonGiftModel == null || !roonGiftModel.isChecked()) {
-                ToastUtils.show("请选择礼物");
+            ToastUtils.show("请选择礼物");
-                return;
+            return;
-            }
+        }
 
-            if (TextUtils.isEmpty(num)) {
+        if (TextUtils.isEmpty(num)) {
-                ToastUtils.show("请选择打赏礼物数量");
+            ToastUtils.show("请选择打赏礼物数量");
-                return;
+            return;
-            }
+        }
-            if (Integer.valueOf(num) <= 0) {
+        if (Integer.valueOf(num) <= 0) {
-                ToastUtils.show("请选择打赏礼物数量");
+            ToastUtils.show("请选择打赏礼物数量");
-                return;
+            return;
-            }
+        }
 
-            //礼物打赏
+        //礼物打赏
-            giftNumber = num;
+        giftNumber = num;
-            MvpPre.reward_zone(circle_id, roonGiftModel.getGift_id(), num, "1");
+        MvpPre.reward_zone(circle_id, roonGiftModel.getGift_id(), num, "1");
     }
+
     @Override
-    public void setGiftList(List<RoonGiftModel> roonGiftModels,int type) {
+    public void setGiftList(List<RoonGiftModel> roonGiftModels, int type) {
 
     }
 
@@ -300,7 +307,7 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
     @Override
     public void reward_zone() {
         com.blankj.utilcode.util.ToastUtils.showShort("打赏成功");
-        EventBus.getDefault().post(new GiftRewardEvent(point,circle_id));
+        EventBus.getDefault().post(new GiftRewardEvent(point, circle_id));
         dismiss();
     }
 

BaseModule/src/main/java/com/xscm/moduleutil/widget/picker/PictureSelectorUtil.java

@@ -137,11 +137,11 @@ public class PictureSelectorUtil {
     public UCrop.Options buildOptions() {
         UCrop.Options options = new UCrop.Options();
         options.setHideBottomControls(true);//是否显示裁剪
-        options.setFreeStyleCropEnabled(true);//裁剪是否可以拖动
+        options.setFreeStyleCropEnabled(false);//裁剪是否可以拖动
         options.setShowCropFrame(true);//是否显示裁剪边缘
         options.setShowCropGrid(true);//是否显示裁剪网格
         options.setCircleDimmedLayer(false);//圆形头像裁剪
-        options.withAspectRatio(1, 1);
+        options.withAspectRatio(1, 1);//裁剪比例
         options.isCropDragSmoothToCenter(false);
         options.isForbidCropGifWebp(false);
         options.isForbidSkipMultipleCrop(true);

BaseModule/src/main/res/anim/up_down_animation.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <translate
+        android:duration="2000"
+        android:fromYDelta="0"
+        android:toYDelta="-20"
+        android:repeatCount="infinite"
+        android:repeatMode="reverse"
+        android:interpolator="@android:anim/accelerate_decelerate_interpolator" />
+</set>

BaseModule/src/main/res/drawable/bg_r12_c5ffc9_f9e9ff_c7ecfa.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:angle="180"
+        android:startColor="#C5FFC9"
+        android:centerColor="#F9E9FF"
+        android:endColor="#C7ECFA"
+        android:type="linear"
+        android:useLevel="true" />
+    <corners
+        android:bottomLeftRadius="12dp"
+        android:bottomRightRadius="12dp"
+        android:topLeftRadius="12dp"
+        android:topRightRadius="12dp" />
+</shape>

BaseModule/src/main/res/drawable/bg_r12_fffac5_f9e9ff_c7d3fa.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:angle="180"
+        android:centerColor="#fff9e9ff"
+        android:endColor="#ffc7d3fa"
+        android:startColor="#fffffac5"
+        android:type="linear"
+        android:useLevel="true" />
+    <corners
+        android:bottomLeftRadius="12dp"
+        android:bottomRightRadius="12dp"
+        android:topLeftRadius="12dp"
+        android:topRightRadius="12dp" />
+</shape>

BaseModule/src/main/res/drawable/bg_r14_1b1926.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#ff1b1926" />
+    <corners
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="0dp"
+        android:topLeftRadius="14dp"
+        android:topRightRadius="14dp" />
+</shape>

BaseModule/src/main/res/drawable/bg_r16_2b2935.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#2B2935"/>
+    <corners android:radius="@dimen/dp_16"/>
+
+</shape>

BaseModule/src/main/res/drawable/bg_r16_3abc6d.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#3ABC6D"/>
+    <corners android:radius="@dimen/dp_16"/>
+
+</shape>

BaseModule/src/main/res/drawable/bg_r16_deff85_cfffdc.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:angle="90"
+        android:centerColor="#CFFFDC"
+        android:endColor="#CFFFDC"
+        android:startColor="#DEFF85"
+        android:type="linear"
+        android:useLevel="true" />
+    <corners
+        android:radius="@dimen/dp_16"
+        />
+</shape>

BaseModule/src/main/res/drawable/bg_r34_3abc6d.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#3ABC6D" />
+    <corners android:radius="@dimen/dp_34"/>
+</shape>

BaseModule/src/main/res/drawable/bg_r48_ff8acc.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/dp_48" />
+    <solid android:color="#FF8ACC" />
+</shape>

BaseModule/src/main/res/drawable/bg_r4_f3ff98_d9ffe1_ffdaed.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:angle="90"
+        android:startColor="#FFDAED"
+        android:centerColor="#ffd9ffe1"
+        android:endColor="#F3FF98"
+        android:type="linear"
+        android:useLevel="true" />
+    <corners
+        android:bottomLeftRadius="4dp"
+        android:bottomRightRadius="4dp"
+        android:topLeftRadius="4dp"
+        android:topRightRadius="4dp" />
+</shape>

BaseModule/src/main/res/drawable/bg_r53_73040404.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#73040404" />
+    <corners
+        android:bottomLeftRadius="53dp"
+        android:bottomRightRadius="53dp"
+        android:topLeftRadius="53dp"
+        android:topRightRadius="53dp" />
+</shape>

BaseModule/src/main/res/drawable/bg_r6_ff6f0_f6d2f2_c2ebff.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:angle="180"
+        android:startColor="#C2EBFF"
+        android:centerColor="#fff5d2f2"
+        android:endColor="#FFF6F0"
+        android:type="linear"
+        android:useLevel="true" />
+    <corners
+        android:bottomLeftRadius="6dp"
+        android:bottomRightRadius="6dp"
+        android:topLeftRadius="6dp"
+        android:topRightRadius="6dp" />
+</shape>

BaseModule/src/main/res/drawable/bg_r8_262431.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#262431" />
+    <corners
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="0dp"
+        android:topLeftRadius="14dp"
+        android:topRightRadius="14dp" />
+</shape>

BaseModule/src/main/res/drawable/bg_r8_top_aeedff.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#AEEDFF"/>
+    <corners
+        android:topLeftRadius="8dp"
+        android:topRightRadius="8dp"
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="0dp"/>
+</shape>

BaseModule/src/main/res/drawable/bg_r99_e7fe67_90ff86_5cfbbd.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:angle="180"
+        android:centerColor="#90FF86"
+        android:endColor="#E7FE67"
+        android:startColor="#5CFBBD"
+        android:type="linear"
+        android:useLevel="true" />
+    <stroke android:color="#FFFFF072" android:width="@dimen/dp_1"/>
+    <corners android:radius="@dimen/dp_99" />
+</shape>

BaseModule/src/main/res/drawable/bg_sigin_status.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#fffcf7eb" />
+    <corners
+        android:bottomLeftRadius="4dp"
+        android:bottomRightRadius="4dp"
+        android:topLeftRadius="4dp"
+        android:topRightRadius="4dp" />
+</shape>