1:添加签约房的按钮

2：我的家族和的身价页面完成 3：个性装扮降身卡完成
2025-11-26 15:52:46 +08:00
parent 1753d9a98d
commit 9887185133
204 changed files with 1873 additions and 245 deletions
--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/EmotionPickerDialog.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/EmotionPickerDialog.kt
@@ -21,7 +21,11 @@ import com.xscm.moduleutil.http.BaseObserver
 import com.xscm.moduleutil.http.RetrofitClient
 import io.reactivex.disposables.Disposable
 import retrofit2.Retrofit
-
+/**
+* @Author
+* @Time 2025/11/25 14:33
+* @Description 表情类型列表
+*/
 class EmotionPickerDialog(context: Context) : Dialog(context, com.xscm.moduleutil.R.style.BaseDialogStyleH) {

    private lateinit var binding: DialogEmotionPickerBinding
--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java
@@ -143,6 +143,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
        dataList.add(new RoomSettingBean("点唱", "jiao_y", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeJiaoy, read, isSelected, false, false));// 添加的新的房间类型 ，交友 ，是原来的男神女神类型
        dataList.add(new RoomSettingBean("互娱", "ic_jiaoy", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeHUYU, read, isSelected, false, false)); //原交友，更改互娱 2025年9月19日11:18:01
        dataList.add(new RoomSettingBean("练歌房", "ic_liang", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeLianG, read, isSelected, false, false)); //练歌房，原点歌房，同意的时候，走同意点歌的逻辑
+        dataList.add(new RoomSettingBean("签约", "sing_contract", null, null, RoomSettingBean.QXRoomSettingTypeRoomTypeSIGNONTRACT, read, isSelected, false, false)); //签约房


        dataList.add(new RoomSettingBean("常用工具", null, null, null, -1, read, isSelected, false, false));
@@ -283,7 +284,10 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
                    queren("7");
                } else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomTypeLianG){
                    queren("-1");
-                }else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomSetting) {
+                }else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomTypeSIGNONTRACT){
+                    queren("10");
+                }
+                else if (bean.getType() == RoomSettingBean.QXRoomSettingTypeRoomSetting) {
                    if (roomInfoResp != null) {
                        ARouter.getInstance().build(ARouteConstants.CREATED_ROOM).withSerializable("roomInfoResp", roomInfoResp).navigation();
                    } else {
@@ -335,7 +339,22 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
        // 创建并显示确认对话框
        new ConfirmDialog(getActivity(),
                "提示",
-                "即将修改房间类型为" + (type.equals("1") ? "交友" : (type.equals("2") ? "拍卖" : (type.equals("3") ? "男神" : (type.equals("4") ? "女神" : (type.equals("7") ? "互娱" : (type.equals("9") ? "点唱" :(type.equals("-1") ? "练歌房" : ""))))))),
+                "即将修改房间类型为" +
+                        (type.equals("1") ? "交友" :
+                                (type.equals("2") ? "拍卖" :
+                                        (type.equals("3") ? "男神" :
+                                                (type.equals("4") ? "女神" :
+                                                        (type.equals("7") ? "互娱" :
+                                                                (type.equals("9") ? "点唱" :
+                                                                        (type.equals("-1") ? "练歌房" :
+                                                                                (type.equals("10") ? "签约房" : "")
+                                                                        )
+                                                                )
+                                                        )
+                                                )
+                                        )
+                                )
+                        ),
                "确认",
                "取消",
                v -> {
@@ -383,7 +402,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment<RoomSettingPresen
            if (type == RoomSettingBean.QXRoomSettingTypeRoomTypeSing || type == RoomSettingBean.QXRoomSettingTypeRoomTypeAuction ||
                    type == RoomSettingBean.QXRoomSettingTypeRoomTypeHUYU ||
                    type == RoomSettingBean.QXRoomSettingTypeRoomTypeJiaoy ||
-                    type == RoomSettingBean.QXRoomSettingTypeRoomTypeLianG ||
+                    type == RoomSettingBean.QXRoomSettingTypeRoomTypeLianG ||  type== RoomSettingBean.QXRoomSettingTypeRoomTypeSIGNONTRACT ||
                    type == RoomSettingBean.QXRoomSettingTypeRoomClearMessage || type == QXRoomSettingTypeRoomOrderMic || type == RoomSettingBean.QXRoomSettingTypeRoomFloatingScreen
                    || type == RoomSettingBean.QXRoomSettingTypeRoomBgMusic || type == RoomSettingBean.QXRoomSettingTypeRoomBgImage || type == -1) {

--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/UserNetWorthDialog.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/UserNetWorthDialog.kt
@@ -0,0 +1,101 @@
+package com.xscm.modulemain.dialog
+
+import android.app.Dialog
+import android.content.Context
+import android.graphics.Point
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.blankj.utilcode.util.ScreenUtils
+import com.xscm.modulemain.databinding.DialogUserNetWorthBinding
+import com.xscm.moduleutil.color.ThemeableDrawableUtils
+import com.xscm.moduleutil.utils.ColorManager
+
+/**
+ * 项目名称：羽声语音
+ * 时间：2025/11/25 14:35
+ * 用途：用户身价详情对话框
+ */
+class UserNetWorthDialog(context: Context) :
+    Dialog(context, com.xscm.moduleutil.R.style.BaseDialogStyleH) {
+
+    private lateinit var mBinding: DialogUserNetWorthBinding
+
+    init {
+        mBinding = DialogUserNetWorthBinding.inflate(LayoutInflater.from(context))
+        setContentView(mBinding.root)
+
+        setupWindow()
+        setupViews()
+        initView()
+    }
+
+    private fun setupViews() {
+    }
+
+    private fun setupWindow() {
+        val window = window ?: return
+        window.setGravity(Gravity.CENTER)
+        window.setLayout(
+            (ScreenUtils.getScreenWidth() * 315f / 375).toInt(),
+            ViewGroup.LayoutParams.WRAP_CONTENT
+        )
+        window.setBackgroundDrawableResource(android.R.color.transparent)
+
+        val params = window.attributes
+        params.windowAnimations = com.xscm.moduleutil.R.style.BaseDialogStyleH
+        window.attributes = params
+
+    }
+
+
+    fun initView() {
+        // 设置对话框不能通过点击外部关闭
+        setCancelable(false)
+        setCanceledOnTouchOutside(false)
+        ThemeableDrawableUtils.setThemeableRoundedBackground(
+            mBinding.tvConfirm,
+            ColorManager.getInstance().getPrimaryColorInt(),
+            53
+        )
+        mBinding.tvConfirm.setTextColor(ColorManager.getInstance().getButtonColorInt())
+        // 设置关闭按钮点击事件
+        mBinding.ivClose.setOnClickListener {
+            dismiss()
+        }
+
+        // 设置确认按钮点击事件
+        mBinding.tvConfirm.setOnClickListener {
+            dismiss()
+        }
+    }
+
+
+    /**
+     * 设置对话框大小，基于375×933的屏幕尺寸，宽高比为312×470
+     */
+    private fun setDialogSize() {
+        val window = window
+        if (window != null) {
+            val display = window.windowManager.defaultDisplay
+            val size = Point()
+            display.getSize(size)
+
+            // 获取屏幕宽度
+            val screenWidth = size.x
+
+            // 基于375宽度计算312的宽度比例
+            val widthRatio = 312f / 375f
+
+            // 基于933高度计算470的高度比例
+            val heightRatio = 470f / 933f
+
+            // 计算对话框的实际宽度和高度
+            val dialogWidth = (screenWidth * widthRatio).toInt()
+            val dialogHeight = (screenWidth * heightRatio).toInt()
+
+            // 设置对话框宽高
+            window.setLayout(dialogWidth, dialogHeight)
+        }
+    }
+}