From 8232415cbfd6967d2efad246983090683997af28 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Wed, 10 Dec 2025 16:16:10 +0800
Subject: [PATCH 1/4] 83

---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 2ad6405d..13253cbd 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.8.2
-APP_VERSION_CODE=72
+APP_VERSION_NAME=1.0.8.3
+APP_VERSION_CODE=73
 
 org.gradle.jvm.toolchain.useLegacyAdapters=false
 #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15

From dab7e1e83ab5f4271f543370ad8286bb5cb1bf33 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 16:21:27 +0800
Subject: [PATCH 2/4] =?UTF-8?q?1:=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A=202?=
 =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E6=94=B9=E9=92=BB=E7=9F=B3=E6=94=AF=E5=87=BA?=
 =?UTF-8?q?=E5=92=8C=E9=87=91=E5=B8=81=E6=94=AF=E5=87=BA=E6=9C=80=E5=90=8E?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MainModule/src/main/res/layout/fragment_revenue.xml  | 3 ++-
 MainModule/src/main/res/layout/room_details_list.xml | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/MainModule/src/main/res/layout/fragment_revenue.xml b/MainModule/src/main/res/layout/fragment_revenue.xml
index da8b11b8..e82d99a9 100644
--- a/MainModule/src/main/res/layout/fragment_revenue.xml
+++ b/MainModule/src/main/res/layout/fragment_revenue.xml
@@ -74,6 +74,7 @@
             android:id="@+id/smart_refresh_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:paddingBottom="@dimen/dp_30"
             app:srlEnableLoadMore="true"
             app:srlEnableRefresh="true">
 
@@ -89,7 +90,7 @@
                     android:layout_marginStart="@dimen/dp_16"
                     android:layout_marginTop="@dimen/dp_10"
                     android:layout_marginEnd="@dimen/dp_16"
-                    android:layout_marginBottom="0dp"
+                    android:paddingBottom="@dimen/dp_100"
                     android:background="@color/color_FFF5F5F5"
                     android:clipToPadding="false"
                     app:layout_constraintBottom_toBottomOf="parent"
diff --git a/MainModule/src/main/res/layout/room_details_list.xml b/MainModule/src/main/res/layout/room_details_list.xml
index 12952d27..439e7473 100644
--- a/MainModule/src/main/res/layout/room_details_list.xml
+++ b/MainModule/src/main/res/layout/room_details_list.xml
@@ -23,8 +23,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_10"
-        android:ellipsize="end"
-        android:maxEms="8"
         android:singleLine="true"
         android:text="阿斯蒂芬就"
         android:textColor="@color/color_FF333333"

From 9d546717dbcf81e864c7dad0fb527b15d6a49ea0 Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Wed, 10 Dec 2025 18:06:10 +0800
Subject: [PATCH 3/4] =?UTF-8?q?83=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/room/fragment/FriendshipRoomFragment.java      | 6 +++---
 .../modulemain/activity/room/fragment/SingSongFragment.java | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/FriendshipRoomFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/FriendshipRoomFragment.java
index 4ee0ffab..12679172 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/FriendshipRoomFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/FriendshipRoomFragment.java
@@ -359,9 +359,9 @@ public class FriendshipRoomFragment extends BaseRoomFragment<FriendshipRoomPrese
         if (checkWeather(pitBean.getPit_number())) {
             showPopupMenu(wheatView); // v 是点击的按钮视图
         } else if (pitBean.getPit_number().equals("10")) {
-            if (ActivityUtils.getTopActivity() instanceof RoomActivity) {
-                if (((RoomActivity) ActivityUtils.getTopActivity()).getHostUser() < 4) {
-                    if (((RoomActivity) ActivityUtils.getTopActivity()).isFastDoubleClick(roomInfoResp.getUser_info().getUser_id() + "", pitBean.getPit_number())) {
+            if (getActivity() != null && getActivity() instanceof RoomActivity) {
+                if (((RoomActivity) getActivity()).getHostUser() < 4) {
+                    if (((RoomActivity) getActivity()).isFastDoubleClick(roomInfoResp.getUser_info().getUser_id() + "", pitBean.getPit_number())) {
                         return;
                     }
                     RoomOnlineDialogFragment.show(roomId, "10", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/SingSongFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/SingSongFragment.java
index e2375a75..8f40264c 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/SingSongFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/SingSongFragment.java
@@ -183,8 +183,8 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
                         roomPitBean = pitBean;
                         showPopupMenu(view); // v 是点击的按钮视图
                     } else if (pitNumber1 == 10) {
-                        if (ActivityUtils.getTopActivity() instanceof RoomActivity){
-                            if (((RoomActivity) ActivityUtils.getTopActivity()).getHostUser() < 4){
+                        if (getActivity() != null && getActivity() instanceof RoomActivity){
+                            if (((RoomActivity) getActivity()).getHostUser() < 4){
                                 if (!isFastDoubleClick("online_dialog", pitNumber1 + "")) {
                                     RoomOnlineDialogFragment.show(roomId, pitNumber1 + "", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
                                 }
@@ -715,7 +715,6 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
                         if (!isFastDoubleClick("online_dialog", pitNumber1 + "")) {
                             RoomOnlineDialogFragment.show(roomId, pitNumber1 + "", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
                         }
-//                        RoomOnlineDialogFragment.show(roomId, pitNumber1 + "", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
                     } else {
                         MvpPre.applyPit(roomId, pitNumber1 + "");
                     }
@@ -785,7 +784,6 @@ public class SingSongFragment extends BaseRoomFragment<SingSongPresenter, Fragme
                         if (!isFastDoubleClick("online_dialog", pitNumber1 + "")) {
                             RoomOnlineDialogFragment.show(roomId, pitNumber1 + "", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
                         }
-//                        RoomOnlineDialogFragment.show(roomId, pitNumber1 + "", roomInfoResp.getUser_info(), roomInfoResp, getChildFragmentManager());
                     } else {
                         MvpPre.applyPit(roomId, pitNumber1 + "");
                     }

From b5b443e1882f3bdb2fc407ae7ba8ec250730a64c Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Wed, 10 Dec 2025 18:10:46 +0800
Subject: [PATCH 4/4] 83 room_details_list

---
 MainModule/src/main/res/layout/room_details_list.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/MainModule/src/main/res/layout/room_details_list.xml b/MainModule/src/main/res/layout/room_details_list.xml
index 439e7473..b66f5d67 100644
--- a/MainModule/src/main/res/layout/room_details_list.xml
+++ b/MainModule/src/main/res/layout/room_details_list.xml
@@ -24,10 +24,11 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_10"
         android:singleLine="true"
-        android:text="阿斯蒂芬就"
+        tools:text=""
         android:textColor="@color/color_FF333333"
         android:textSize="@dimen/sp_12"
         app:layout_constraintStart_toEndOf="@id/riv"
+        app:layout_constraintEnd_toStartOf="@id/tv_go_to_room"
         app:layout_constraintTop_toTopOf="@id/riv" />
     <TextView
         android:id="@+id/tv_1"
@@ -43,7 +44,7 @@
         android:id="@+id/tv_2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="摸鱼"
+        tools:text="摸鱼"
         android:textColor="@color/color_FF333333"
         android:layout_marginStart="@dimen/dp_5"
         android:textSize="@dimen/sp_10"
@@ -54,7 +55,7 @@
         android:id="@+id/tv_3"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="功夫熊猫*1"
+        tools:text="功夫熊猫*1"
         android:textColor="@color/color_FF333333"
         android:layout_marginStart="@dimen/dp_5"
         android:textSize="@dimen/sp_10"
@@ -68,7 +69,7 @@
         android:layout_marginStart="@dimen/dp_10"
         android:gravity="center"
         android:padding="@dimen/dp_3"
-        android:text="+12.5"
+        tools:text="+12.5"
         android:textColor="@color/_000000"
         android:textSize="@dimen/sp_10"
         app:layout_constraintBottom_toBottomOf="parent"