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( - 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); } }