From 5f6db6285ea68ff49ef7a0924ac24b3e08c46878 Mon Sep 17 00:00:00 2001
From: eggmanQQQ <3671373519@qq.com>
Date: Wed, 8 Jan 2025 17:48:01 +0800
Subject: [PATCH] =?UTF-8?q?feat=20:=20=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../avroom/activity/RoomTypeSwitchActivity.kt  |  2 +-
 .../chwl/app/pay/activity/GiveGoldActivity.kt  |  4 ++++
 app/src/main/res/layout/home_item_room.xml     | 18 +++++++++++-------
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/chwl/app/avroom/activity/RoomTypeSwitchActivity.kt b/app/src/main/java/com/chwl/app/avroom/activity/RoomTypeSwitchActivity.kt
index 9ee118b17..1cbb6b04a 100644
--- a/app/src/main/java/com/chwl/app/avroom/activity/RoomTypeSwitchActivity.kt
+++ b/app/src/main/java/com/chwl/app/avroom/activity/RoomTypeSwitchActivity.kt
@@ -137,7 +137,7 @@ class RoomTypeSwitchActivity : BaseViewBindingActivity<RoomTypeSwitchActivityBin
                     binding.avatar.load(mCurrentRoomInfo?.avatar)
                     binding.nick.text = mCurrentRoomInfo?.title
                     binding.levelIcon.load(it.getCurrentLevelIcon())
-                    binding.roomValue.text = R.string.Room_Value_s.getString(it.roomVal.toInt().toString())
+                    binding.roomValue.text = R.string.Room_Value_s.getString(it.roomVal.toLong().toString())
                     binding.roomAdmin.text = R.string.Room_Admin_s.getString(it.currentManagerNum,it.managerLimitNum)
                     binding.currentLevel.text = R.string.LV_s.getString(it.currentLevel)
                     binding.nextLevel.text = R.string.LV_s.getString(it.nextLevel)
diff --git a/app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt b/app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt
index d6c1285d0..6f8079f01 100644
--- a/app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt
+++ b/app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt
@@ -149,6 +149,10 @@ class GiveGoldActivity : BaseViewBindingActivity<ActivityGiveGoldBinding>() {
             .doOnSuccess {
                 binding.starLayout.removeAllViews()
                 if (it != null) {
+                    if (it.starLevel == -1) {
+                        binding.userInfo.setVis(false)
+                        return@doOnSuccess
+                    }
                     for (i in 0 until 5) {
                         val star = ImageView(context)
                         star.setViewWH(15, 15)
diff --git a/app/src/main/res/layout/home_item_room.xml b/app/src/main/res/layout/home_item_room.xml
index 39f0864c2..923f88fb8 100644
--- a/app/src/main/res/layout/home_item_room.xml
+++ b/app/src/main/res/layout/home_item_room.xml
@@ -77,11 +77,13 @@
         <com.chwl.library.widget.text.DrawableTextView
             android:id="@+id/tv_room_title"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/dp_21"
             android:drawablePadding="2dp"
             android:ellipsize="end"
             android:maxLines="1"
-            android:paddingEnd="30dp"
+            android:maxWidth="200dp"
+            android:gravity="center_vertical"
+            android:paddingEnd="10dp"
             android:textColor="@color/color_1E1E1F"
             android:textSize="@dimen/sp_15"
             android:textStyle="bold"
@@ -92,7 +94,7 @@
             app:layout_constraintStart_toEndOf="@id/flag"
             app:layout_constraintTop_toTopOf="@+id/iv_room_image"
             app:layout_constraintVertical_chainStyle="packed"
-            tools:text="111" />
+            tools:text="11111111111111111111111111111111111111111" />
 
         <View
             android:id="@+id/tv_room_title_max"
@@ -100,13 +102,14 @@
             android:layout_height="10dp"
             android:ellipsize="end"
             android:maxLines="1"
-            android:paddingEnd="30dp"
+            android:layout_marginStart="30dp"
+            android:layout_marginEnd="50dp"
             android:textColor="@color/color_1E1E1F"
             android:textSize="@dimen/sp_15"
             android:textStyle="bold"
             app:layout_constraintBottom_toTopOf="@id/tv_desc"
-            app:layout_constraintEnd_toStartOf="@id/boomIcon"
-            app:layout_constraintStart_toEndOf="@id/flag"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/iv_room_image"
             app:layout_constraintTop_toTopOf="@+id/iv_room_image" />
 
 
@@ -125,10 +128,11 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tv_desc"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/dp_18"
             android:layout_marginStart="3dp"
             android:layout_marginTop="6dp"
             android:layout_marginEnd="4dp"
+            android:gravity="center_vertical"
             android:ellipsize="end"
             android:hint="@string/home_room_card_topic_empty_def"
             android:includeFontPadding="false"