From 3e6d34a98678e7c11bcd4837e6e4281e9d4ab856 Mon Sep 17 00:00:00 2001
From: eggmanQQQ <3671373519@qq.com>
Date: Wed, 31 Jul 2024 18:48:14 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=AD=A3=E4=B8=AA?=
 =?UTF-8?q?=E6=92=AD=E6=88=BF=E7=8E=A9=E6=B3=95=E5=85=A5=E5=8F=A3=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/avroom/fragment/SingleRoomFragment.kt | 46 +++++++++----------
 .../main/res/layout/fragment_single_room.xml  | 12 +++--
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt b/app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt
index 77baf29d0..66fb9604c 100644
--- a/app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt
+++ b/app/src/main/java/com/chwl/app/avroom/fragment/SingleRoomFragment.kt
@@ -118,29 +118,29 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
     }
 
     fun updateConfigButtonArea() {
-//        val configModel = AvRoomDataManager.get().rightBottomIconConfig
-//        if (configModel == null) {
-//            gameBinding.ivConfigEntrance.visibility = View.GONE
-//        } else {
-//            if (configModel.icon1Url == null) {
-//                gameBinding.ivConfigEntrance.visibility = View.GONE
-//            } else {
-//                ImageLoadUtils.loadAvatar(configModel.icon1Url, gameBinding.ivConfigEntrance)
-//                gameBinding.ivConfigEntrance.visibility = View.VISIBLE
-//            }
-//            if (configModel.icon2Url != null) {
-//                ImageLoadUtils.loadAvatar(configModel.icon2Url, gameBinding.ivGame)
-//            }
-//        }
-//        if (AvRoomDataManager.get().isDatingMode) {
-//            gameBinding.ivGame.visibility = View.GONE
-//        } else {
-//            if (hasBaishunGames) {
-//                gameBinding.ivGame.visibility = View.VISIBLE
-//            } else {
-//                gameBinding.ivGame.visibility = View.GONE
-//            }
-//        }
+        val configModel = AvRoomDataManager.get().rightBottomIconConfig
+        if (configModel == null) {
+            gameBinding.ivConfigEntrance.visibility = View.GONE
+        } else {
+            if (configModel.icon1Url == null) {
+                gameBinding.ivConfigEntrance.visibility = View.GONE
+            } else {
+                ImageLoadUtils.loadAvatar(configModel.icon1Url, gameBinding.ivConfigEntrance)
+                gameBinding.ivConfigEntrance.visibility = View.VISIBLE
+            }
+            if (configModel.icon2Url != null) {
+                ImageLoadUtils.loadAvatar(configModel.icon2Url, gameBinding.ivGame)
+            }
+        }
+        if (AvRoomDataManager.get().isDatingMode) {
+            gameBinding.ivGame.visibility = View.GONE
+        } else {
+            if (hasBaishunGames) {
+                gameBinding.ivGame.visibility = View.VISIBLE
+            } else {
+                gameBinding.ivGame.visibility = View.GONE
+            }
+        }
     }
 
     override fun onReceiveRoomEvent(roomEvent: RoomEvent?) {
diff --git a/app/src/main/res/layout/fragment_single_room.xml b/app/src/main/res/layout/fragment_single_room.xml
index 5ada2aefd..fc8618ea5 100644
--- a/app/src/main/res/layout/fragment_single_room.xml
+++ b/app/src/main/res/layout/fragment_single_room.xml
@@ -173,29 +173,32 @@
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/dp_130"
             android:clipChildren="false"
-            app:layout_constraintBottom_toTopOf="@id/bottom_view">
+            app:layout_constraintBottom_toTopOf="@+id/bottom_view">
 
             <ImageView
+                android:id="@+id/iv_config_entrance"
                 android:layout_width="@dimen/dp_38"
                 android:layout_height="@dimen/dp_38"
-                android:layout_alignParentEnd="true"
                 android:layout_above="@id/iv_game"
+                android:layout_alignParentEnd="true"
                 android:layout_marginEnd="@dimen/dp_11"
                 android:layout_marginBottom="@dimen/dp_10"
                 android:onClick="@{click}"
                 android:src="@drawable/room_ic_collect_no"
                 android:visibility="visible"
-                tools:visibility="visible"/>
+                tools:visibility="visible" />
 
             <ImageView
                 android:id="@+id/iv_game"
                 android:layout_width="@dimen/dp_38"
                 android:layout_height="@dimen/dp_38"
                 android:layout_alignParentEnd="true"
+                android:layout_alignParentBottom="true"
                 android:layout_marginEnd="@dimen/dp_11"
                 android:layout_marginBottom="@dimen/dp_20"
+                android:alpha="1"
                 android:onClick="@{click}"
                 android:src="@drawable/room_ic_game"
                 android:visibility="visible"
@@ -244,7 +247,6 @@
         </LinearLayout>
 
 
-
         <RelativeLayout
             android:id="@+id/input_layout"
             android:layout_width="0dp"