From 314ce6007d349af49cf9b5ecf7de08ffcfdf5a48 Mon Sep 17 00:00:00 2001 From: lzl <1239365383@qq.com> Date: Tue, 9 Dec 2025 19:04:19 +0800 Subject: [PATCH 1/5] fix bugs. 1 --- .../activity/room/activity/RoomActivity.kt | 1 + .../res/layout/fragment_friendship_room.xml | 2 +- .../layout/layout_room_mentorship_wheat.xml | 158 ++++++++++-------- 3 files changed, 88 insertions(+), 73 deletions(-) diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt index 198789da..b9e69c68 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt @@ -2531,6 +2531,7 @@ class RoomActivity : BaseMvpActivity(), 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 } diff --git a/MainModule/src/main/res/layout/fragment_friendship_room.xml b/MainModule/src/main/res/layout/fragment_friendship_room.xml index a14c5588..ca14806e 100644 --- a/MainModule/src/main/res/layout/fragment_friendship_room.xml +++ b/MainModule/src/main/res/layout/fragment_friendship_room.xml @@ -6,7 +6,7 @@ + android:layout_height="@dimen/dp_340"> + app:layout_constraintTop_toTopOf="parent"> - - - + app:layout_constraintTop_toTopOf="parent"> + + + + + + + + + + + + + + + + + - - - - - - - - - - @@ -148,17 +172,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/gl_center" /> - - + From aa568d73eeea621ec7affb9b695dc9574ee46bbe Mon Sep 17 00:00:00 2001 From: lzl <1239365383@qq.com> Date: Tue, 9 Dec 2025 19:33:42 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E8=AE=BE=E7=BD=AE=E4=B8=BB=E6=8C=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java | 1 + 1 file changed, 1 insertion(+) diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java index 891272a9..122e5805 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java @@ -385,6 +385,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment Date: Wed, 10 Dec 2025 09:44:00 +0800 Subject: [PATCH 3/5] =?UTF-8?q?1:=E5=8E=BB=E6=8E=89=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E6=B8=85?= =?UTF-8?q?=E7=A9=BA=E5=80=92=E8=AE=A1=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xscm/modulemain/dialog/InviteDialog.kt | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/InviteDialog.kt b/MainModule/src/main/java/com/xscm/modulemain/dialog/InviteDialog.kt index 64a4c9a9..960c789d 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/InviteDialog.kt +++ b/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(context) { +class InviteDialog(context: Context, data: IndexRecommendRoom?) : + BaseDialog(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 - if (countDownTimer != null) { - countDownTimer?.cancel() - } dismiss() }) } From a9af0efdc9115f5105b64634ff8bc17c8c3f22eb Mon Sep 17 00:00:00 2001 From: lzl <1239365383@qq.com> Date: Wed, 10 Dec 2025 09:50:18 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E6=89=93=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MainModule/src/main/java/com/xscm/modulemain/Application.kt | 3 +-- gradle.properties | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/MainModule/src/main/java/com/xscm/modulemain/Application.kt b/MainModule/src/main/java/com/xscm/modulemain/Application.kt index e12fa343..5f6e1f00 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/Application.kt +++ b/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?) {//应用切换到前台 diff --git a/gradle.properties b/gradle.properties index 3cc49b90..9f13af9e 100644 --- a/gradle.properties +++ b/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_CODE=69 +APP_VERSION_NAME=1.0.8.0 +APP_VERSION_CODE=70 org.gradle.jvm.toolchain.useLegacyAdapters=false #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15 From 75f11fdb06b9e17948a9dba527a493c7cb593763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com> Date: Wed, 10 Dec 2025 09:59:09 +0800 Subject: [PATCH 5/5] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9=E4=BA=8C?= =?UTF-8?q?=E6=AC=A1=E9=AA=8C=E8=AF=81=E7=9A=84=E6=96=87=E5=AD=97=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/dialog_secondary_verification.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MainModule/src/main/res/layout/dialog_secondary_verification.xml b/MainModule/src/main/res/layout/dialog_secondary_verification.xml index 82045d92..714df0e9 100644 --- a/MainModule/src/main/res/layout/dialog_secondary_verification.xml +++ b/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" />