Merge branch 'branch_new' into branch_new_69

MainModule/src/main/java/com/xscm/modulemain/Application.kt

@@ -64,8 +64,7 @@ open class Application : CommonAppContext() {
         initLogUtils()
         initCrashUtils()
         initSmartRefreshLayout()
-        if (true)
+
-            return
         AppUtils.registerAppStatusChangedListener(object : Utils.OnAppStatusChangedListener {
             override fun onForeground(activity: Activity?) {//应用切换到前台
 

MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt

@@ -2527,6 +2527,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         pitBean.nickname = messageEvent.text.fromUserInfo.nickname
         pitBean.sex = messageEvent.text.fromUserInfo.sex.toString() + ""
         pitBean.charm = messageEvent.text.fromUserInfo.charm
+        pitBean.dress = messageEvent.text.fromUserInfo.dress
         pitBean.is_online = messageEvent.text.fromUserInfo.is_online
         return pitBean
     }

MainModule/src/main/java/com/xscm/modulemain/dialog/InviteDialog.kt

@@ -19,17 +19,11 @@ import com.xscm.moduleutil.widget.dialog.BaseDialog
  * 时间：2025/12/8 16:19
  * 用途：首页推荐房间
  */
-class InviteDialog(context: Context, data: IndexRecommendRoom?) : BaseDialog<DialogInviteBinding>(context) {
+class InviteDialog(context: Context, data: IndexRecommendRoom?) :
+    BaseDialog<DialogInviteBinding>(context) {
     private var countDownTimer: CountDownTimer? = null // 倒计时器
     private var data: IndexRecommendRoom? = data // 将构造函数参数赋值给成员变量
-//    companion object {
+
-//        // 修改方法签名，允许 data 为空
-//        fun show(context: Context, data: IndexRecommendRoom?) {
-//            // 创建并显示对话框，即使 data 为空也显示
-//            val dialog = InviteDialog(context, data)
-//            dialog.show()
-//        }
-//    }
     init {
         // 设置对话框从底部弹出
         window?.setGravity(Gravity.CENTER)
@@ -76,6 +70,7 @@ class InviteDialog(context: Context, data: IndexRecommendRoom?) : BaseDialog<Dia
             dismiss()
         }
     }
+
     fun setData(data: IndexRecommendRoom?) {
         this.data = data
         // 设置房间数据
@@ -96,7 +91,7 @@ class InviteDialog(context: Context, data: IndexRecommendRoom?) : BaseDialog<Dia
      * 开始倒计时
      */
     private fun startCountDown() {
-
+        countDownTimer?.cancel() // 确保之前的计时器被取消
         countDownTimer = object : CountDownTimer(9 * 1000L, 1000) {
             override fun onTick(millisUntilFinished: Long) {
                 val secondsLeft = (millisUntilFinished / 1000).toInt()
@@ -105,17 +100,13 @@ class InviteDialog(context: Context, data: IndexRecommendRoom?) : BaseDialog<Dia
 
             override fun onFinish() {
                 // 检查是否被主动取消
-                    dismiss()
+                dismiss()
             }
         }.start()
 
 
-
         // 设置点击事件，点击按钮也关闭对话框
         mBinding.btnNegative.setOnClickListener({ v ->
-            if (countDownTimer != null) {
-                countDownTimer?.cancel()
-            }
             dismiss()
         })
     }

MainModule/src/main/res/layout/dialog_secondary_verification.xml

@@ -75,7 +75,7 @@
                 android:singleLine="true"
                 android:textColor="@color/black"
                 android:textColorHint="@color/color_FFCCCCCC"
-                android:textSize="@dimen/sp_16" />
+                android:textSize="@dimen/sp_14" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -91,7 +91,7 @@
                     android:gravity="right"
                     android:text="@string/login_send_code"
                     android:textColor="#FF8ACC"
-                    android:textSize="@dimen/sp_16"
+                    android:textSize="@dimen/sp_14"
                     tools:visibility="visible" />
 
             </LinearLayout>

gradle.properties

@@ -28,8 +28,8 @@ isBuildModule=false
 #org.gradle.deamon=false
 android.injected.testOnly=false
 
-APP_VERSION_NAME=1.0.7.9
+APP_VERSION_NAME=1.0.8.0
-APP_VERSION_CODE=69
+APP_VERSION_CODE=70
 
 org.gradle.jvm.toolchain.useLegacyAdapters=false
 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15