From f2fc382e4c3030cf1f985f76c5c9f77007ab71a1 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, 1 Oct 2025 14:38:33 +0800
Subject: [PATCH] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9=E8=B8=A9=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=202=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=B7=A1?=
 =?UTF-8?q?=E4=B9=90=E4=BC=9A=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle.properties                                 |  4 ++--
 .../main/res/layout/fragment_tour_club_dialog.xml |  4 ++--
 .../example/moduleroom/activity/RoomActivity.kt   | 15 +++++++++++----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index f35b423..cf8df8a 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.2.0
-APP_VERSION_CODE=172
+APP_VERSION_NAME=1.2.1
+APP_VERSION_CODE=173
 
 org.gradle.jvm.toolchain.useLegacyAdapters=false
 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15
diff --git a/moduleUtil/src/main/res/layout/fragment_tour_club_dialog.xml b/moduleUtil/src/main/res/layout/fragment_tour_club_dialog.xml
index e2f24a5..03bae97 100644
--- a/moduleUtil/src/main/res/layout/fragment_tour_club_dialog.xml
+++ b/moduleUtil/src/main/res/layout/fragment_tour_club_dialog.xml
@@ -115,7 +115,7 @@
             android:id="@+id/gv_xyz"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_21"
+            android:layout_marginTop="@dimen/dp_31"
             app:layout_constraintEnd_toStartOf="@+id/iv_zyx"
             android:translationY="@dimen/dp_78"
             app:layout_constraintTop_toBottomOf="@+id/gv_fz"
@@ -163,7 +163,7 @@
         <com.xscm.moduleutil.view.QXMeetGiftView
             android:id="@+id/gv_sdlw"
             android:layout_width="@dimen/dp_94"
-            android:layout_height="@dimen/dp_118"
+            android:layout_height="@dimen/dp_108"
             android:layout_marginTop="14dp"
             app:layout_constraintTop_toTopOf="@+id/gv_xyz"
             app:layout_constraintStart_toStartOf="@+id/gv_fzlw"
diff --git a/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt b/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt
index 7336996..bc0a335 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt
+++ b/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt
@@ -3531,10 +3531,17 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
                 }
             }
             mBinding!!.ivQuanC.setOnClickListener { v: View? ->
-                ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS)
-                    .withString("from", "我的界面")
-                    .withString("roomId", mRoomInfoResp!!.room_info.head_line.room_id)
-                    .navigation()
+                if (mRoomInfoResp!!.room_info.head_line.room_id != null && mRoomInfoResp!!.room_info.head_line.room_id.isNotEmpty()){
+                    if (mRoomInfoResp!!.room_info.head_line.room_id != roomId){
+                        RoomManager.getInstance().fetchRoomDataAndEnter(applicationContext,mRoomInfoResp!!.room_info.head_line.room_id,"")
+                    }else{
+                        com.blankj.utilcode.util.ToastUtils.showLong("您就在当前房间")
+                    }
+                }
+//                ARouter.getInstance().build(ARouteConstants.ROOM_DETAILS)
+//                    .withString("from", "我的界面")
+//                    .withString("roomId", mRoomInfoResp!!.room_info.head_line.room_id)
+//                    .navigation()
             }
 
             mBinding!!.imYc.setOnClickListener { v: View? ->