From 67044ded6b53b940172d7cbc440ae5919e8118ac Mon Sep 17 00:00:00 2001
From: eggmanQQQ <3671373519@qq.com>
Date: Thu, 1 Aug 2024 17:57:01 +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

---
 .../fragment/HomePartyRoomFragment.java       | 10 ++---
 .../app/avroom/fragment/SingleRoomFragment.kt | 42 -------------------
 .../chwl/app/avroom/widget/BottomView.java    |  2 +-
 3 files changed, 4 insertions(+), 50 deletions(-)

diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyRoomFragment.java b/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyRoomFragment.java
index f22165da9..7586e7f3b 100644
--- a/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyRoomFragment.java
+++ b/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyRoomFragment.java
@@ -547,14 +547,10 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
             }
         }
 
-        if (AvRoomDataManager.get().isDatingMode()) {
+        if (hasBaishunGames) {
+            gameBinding.ivGame.setVisibility(View.VISIBLE);
+        }else {
             gameBinding.ivGame.setVisibility(View.GONE);
-        } else {
-            if (hasBaishunGames) {
-                gameBinding.ivGame.setVisibility(View.VISIBLE);
-            }else {
-                gameBinding.ivGame.setVisibility(View.GONE);
-            }
         }
     }
 
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 66fb9604c..9c1f0f4c7 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
@@ -99,48 +99,6 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
                 updateFansTeamInfo(it)
             }
         }
-
-        requestData()
-    }
-
-    private fun requestData() {
-        val dataService = get()!!.findAbility<RoomAbility>(
-            RoomDataService::class.java.simpleName
-        ) as RoomDataService?
-        val cacheKey = "gameplay_list#" + hashCode()
-        val disposable = AvRoomModel.get().roomGamePlayList.doOnError {
-            updateConfigButtonArea()
-        }.subscribe { roomIcons ->
-            dataService?.putData(cacheKey, roomIcons)
-            hasBaishunGames = roomIcons.size > 0
-            updateConfigButtonArea()
-        }
-    }
-
-    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
-            }
-        }
     }
 
     override fun onReceiveRoomEvent(roomEvent: RoomEvent?) {
diff --git a/app/src/main/java/com/chwl/app/avroom/widget/BottomView.java b/app/src/main/java/com/chwl/app/avroom/widget/BottomView.java
index baba27a09..b50d4f0ac 100644
--- a/app/src/main/java/com/chwl/app/avroom/widget/BottomView.java
+++ b/app/src/main/java/com/chwl/app/avroom/widget/BottomView.java
@@ -270,7 +270,7 @@ public class BottomView extends LinearLayout implements View.OnClickListener {
             pkGameView.setVisibility(GONE);
             iconRoomBaiShunGame.setVisibility(GONE);
         }
-        if (AvRoomDataManager.get().isSingleRoom()) {
+        if (AvRoomDataManager.get().isSingleRoom() || AvRoomDataManager.get().isDatingMode()) {
             pkGameView.setVisibility(GONE);
         }
     }