From 7560110af20ea793f8f31c3aa5a3e22eb3ff670a Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 15 Nov 2023 18:21:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E3=80=90Habu=E3=80=91=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E5=88=86=E4=BA=AB=E3=80=81=E6=B8=B8=E6=88=8F=E6=88=BF=E5=85=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../avroom/fragment/HomePartyFragment.java | 27 ++++++++++--------- .../main/res/layout/dialog_create_room.xml | 1 + .../layout/fragment_chatroom_game_main.xml | 1 + 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java index 011db34c0..87c115890 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java @@ -171,11 +171,11 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe setupRoomTitleMarquee(); roomMore = mView.findViewById(R.id.room_more); ivRoomShare = mView.findViewById(R.id.iv_room_share); - if (SuperAdminUtil.isSuperAdmin()) { - ivRoomShare.setVisibility(View.INVISIBLE); - } else { - ivRoomShare.setVisibility(View.VISIBLE); - } +// if (SuperAdminUtil.isSuperAdmin()) { +// ivRoomShare.setVisibility(View.INVISIBLE); +// } else { +// ivRoomShare.setVisibility(View.VISIBLE); +// } roomId = mView.findViewById(R.id.room_id); mVsGift2View = mView.findViewById(R.id.vs_gift_view); mIvGoodNumber = mView.findViewById(R.id.iv_good_number); @@ -288,14 +288,15 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe //这里的2和4是服务端定义的错误状态 关闭排麦模式和关闭PK模式! private boolean isShowChangeGame() { - RoomInfo currentRoomInfo = AvRoomDataManager.get().mCurrentRoomInfo; - return currentRoomInfo != null && - AvRoomDataManager.get().isRoomOwner() && - currentRoomInfo.getIsPermitRoom() != 1 && - currentRoomInfo.getType() != RoomInfo.ROOM_TYPE_SINGLE && - (currentRoomInfo.getRoomModeType() == RoomModeType.NORMAL_MODE || - currentRoomInfo.getRoomModeType() == 2 || - currentRoomInfo.getRoomModeType() == 4); + return false; +// RoomInfo currentRoomInfo = AvRoomDataManager.get().mCurrentRoomInfo; +// return currentRoomInfo != null && +// AvRoomDataManager.get().isRoomOwner() && +// currentRoomInfo.getIsPermitRoom() != 1 && +// currentRoomInfo.getType() != RoomInfo.ROOM_TYPE_SINGLE && +// (currentRoomInfo.getRoomModeType() == RoomModeType.NORMAL_MODE || +// currentRoomInfo.getRoomModeType() == 2 || +// currentRoomInfo.getRoomModeType() == 4); } public void setRoomBg(RoomInfo roomInfo) { diff --git a/app/src/main/res/layout/dialog_create_room.xml b/app/src/main/res/layout/dialog_create_room.xml index 3abbcc966..fcaeeca8d 100644 --- a/app/src/main/res/layout/dialog_create_room.xml +++ b/app/src/main/res/layout/dialog_create_room.xml @@ -61,6 +61,7 @@ android:button="@null" />