From 99da150b4e737d93e44f78eb49d7ea144709e58b Mon Sep 17 00:00:00 2001 From: huangjian Date: Wed, 15 Dec 2021 15:12:37 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=89=8C=E7=85=A7=E6=88=BF=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E5=BC=80=E5=90=AF=E6=B8=B8=E6=88=8F=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=202.=E8=B7=A8=E6=88=BFPK=20UI=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../avroom/fragment/HomePartyFragment.java | 8 ++++-- .../home/fragment/HomeTabHomeFragment.java | 12 ++++++++ .../erban/home/helper/OpenRoomHelper.java | 2 +- .../color_selector_white_false_7a7ca0.xml | 2 +- .../res/drawable-xhdpi/ic_room_arrow_type.png | Bin 383 -> 291 bytes .../ic_room_arrow_type_below.png | Bin 0 -> 289 bytes .../main/res/drawable/bg_room_pk_bottom.xml | 4 +-- .../res/drawable/bg_room_pk_common_btn.xml | 2 +- app/src/main/res/drawable/bg_room_pk_rb.xml | 6 ++-- .../res/layout/activity_room_pk_create.xml | 6 ++-- .../res/layout/activity_room_pk_search.xml | 9 +++--- .../layout/fragment_chatroom_game_main.xml | 27 +++++++++++++----- gradle.properties | 1 - 13 files changed, 52 insertions(+), 27 deletions(-) create mode 100644 app/src/main/res/drawable-xhdpi/ic_room_arrow_type_below.png 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 88b1625e2..5bc7c6383 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 @@ -224,18 +224,20 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi AvRoomDataManager.get().mIsNeedGiftEffect = AvRoomDataManager.get().mCurrentRoomInfo.isHasAnimationEffect(); } - if (AvRoomDataManager.get().isRoomOwner()) { + if (AvRoomDataManager.get().isRoomOwner() && roomInfo.getIsPermitRoom() != 1) { gameMainBinding.llChangeGame.setVisibility(View.VISIBLE); gameMainBinding.rvGame.setLayoutManager(new LinearLayoutManager(mContext)); gameMainBinding.rvGame.setAdapter(gameAdapter = new SelectGameAdapter()); gameMainBinding.tvCurrGame.setOnClickListener(v -> { if (gameMainBinding.rvGame.getVisibility() == View.VISIBLE) { gameMainBinding.rvGame.setVisibility(View.GONE); + gameMainBinding.ivChangeGameArrow.setImageResource(R.drawable.ic_room_arrow_type); } else { if (AvRoomDataManager.get().isGamePlaying()) { SingleToastUtil.showToast("游戏中不可以切换游戏或玩法!"); } else { gameMainBinding.rvGame.setVisibility(View.VISIBLE); + gameMainBinding.ivChangeGameArrow.setImageResource(R.drawable.ic_room_arrow_type_below); } } }); @@ -537,7 +539,7 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi ButtonItem buttonItem1 = new ButtonItem("退出房间", new ButtonItem.OnClickListener() { @Override public void onClick() { - if (AvRoomDataManager.get().isGamePlaying(AuthModel.get().getCurrentUid())){ + if (AvRoomDataManager.get().isGamePlaying(AuthModel.get().getCurrentUid())) { getDialogManager().showOkCancelDialog("游戏中退出房间默认逃跑,确定进行此操作?", false, () -> ((AVRoomActivity) getActivity()).toBack()); return; @@ -576,7 +578,7 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi ButtonItem buttonItem2 = new ButtonItem("最小化房间", new ButtonItem.OnClickListener() { @Override public void onClick() { - if (AvRoomDataManager.get().isGamePlaying(AuthModel.get().getCurrentUid())){ + if (AvRoomDataManager.get().isGamePlaying(AuthModel.get().getCurrentUid())) { getDialogManager().showOkCancelDialog("游戏中最小化房间默认逃跑,确定进行此操作?", false, () -> ((AVRoomActivity) getActivity()).toBack()); return; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java index 76d2888a2..907ea2386 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java @@ -24,6 +24,7 @@ import com.yizhuan.xchat_android_core.utils.net.RxHelper; import com.yizhuan.xchat_android_library.utils.ListUtils; import com.yizhuan.xchat_android_library.utils.log.MLog; +import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -181,6 +182,17 @@ public class HomeTabHomeFragment extends BaseFragment { getData(); } + @Override + public void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + EventBus.getDefault().register(this); + } + + @Override + public void onDestroy() { + super.onDestroy(); + EventBus.getDefault().unregister(this); + } @Subscribe(threadMode = ThreadMode.MAIN) public void onRefreshHomeDataEvent(RefreshHomeDataEvent event) { diff --git a/app/src/main/java/com/yizhuan/erban/home/helper/OpenRoomHelper.java b/app/src/main/java/com/yizhuan/erban/home/helper/OpenRoomHelper.java index a79dda15d..6f1aca32e 100644 --- a/app/src/main/java/com/yizhuan/erban/home/helper/OpenRoomHelper.java +++ b/app/src/main/java/com/yizhuan/erban/home/helper/OpenRoomHelper.java @@ -108,7 +108,7 @@ public class OpenRoomHelper { public void acceptThrowable(RoomInfo roomInfo, Throwable throwable) { super.acceptThrowable(roomInfo, throwable); if (roomInfo != null) { - if (roomInfo.isReselect() && type == RoomInfo.ROOMTYPE_DEFAULT) { + if (roomInfo.isReselect() && type == RoomInfo.ROOMTYPE_DEFAULT && roomInfo.getIsPermitRoom() != 1) { activity.getDialogManager().dismissDialog(); new CreateRoomDialog().show(activity); } else { diff --git a/app/src/main/res/color/color_selector_white_false_7a7ca0.xml b/app/src/main/res/color/color_selector_white_false_7a7ca0.xml index 80f000345..7c7311c94 100644 --- a/app/src/main/res/color/color_selector_white_false_7a7ca0.xml +++ b/app/src/main/res/color/color_selector_white_false_7a7ca0.xml @@ -3,6 +3,6 @@ - + diff --git a/app/src/main/res/drawable-xhdpi/ic_room_arrow_type.png b/app/src/main/res/drawable-xhdpi/ic_room_arrow_type.png index ece07cfa4c2abd3f0e56820fa955e94ef3e819c6..cde24ec7743e6e47ee3ea0efd8f3a7aaaf6c7881 100644 GIT binary patch literal 291 zcmV+;0o?wHP)Px#-AP12R5(wik}+<=KomsZK!FR#jB^(5b6ltJNijX5f4H~qO zvB0sti}>x%f11^QB4KPlg_xw@SX{Ay?LM$Ba<7uMZ9A<%+g)Gw*RKKq3uUt13Wi0`2mKK_SN?$;5#sl9Bd&eivn#2 zPynV(CTVdQylPk|6296?p#i(%>!nI1utt$YCRZw50_zk>g_bJ)0b3MF1(qtwb_e(Z pUQ)Lka^Jw<4EzK}cLKvPM<>&~OAHXkWXk{m002ovPDHLkV1j^iaJm2h literal 383 zcmV-_0f7FAP)Px$IY~r8R9Hvtlrb^{Q4~ebMa&XV0x30_fQ6X77<(}bArMH239tlWT=lCuP+dLk z|L)(#RK1sU^6K@e)3>i!v(cLI62Mb`u`nElTLvN$5s8Sz)ENlFVYuHw^lPBC!F@hNr#cnYgOZ-(J8+%gc6h)6^vrp`bZ d4#WKhz5#*sO)Y%;z*_(S002ovPDHLkV1i!rqG134 diff --git a/app/src/main/res/drawable-xhdpi/ic_room_arrow_type_below.png b/app/src/main/res/drawable-xhdpi/ic_room_arrow_type_below.png new file mode 100644 index 0000000000000000000000000000000000000000..36bb98f1a91d2a48c0ea70e1cc52e8a36109a118 GIT binary patch literal 289 zcmV++0p9+JP)Px#+et)0R5(wi(#?(mK@`RD|1s7)f)NW_VmA`=AlkEN&oVp+iC)-@H4EkuSd)_K zT%8&p>DFp}>sRMij+}E9UMS z2c1e9-OfA%Yqomx3A(dYkA=XTDrFUU^w`6MIaSIkQU>%@S^&QI{v^OaQd*Ih!JtaN ncDWl?q!egqBQ34;msh6?<<(0Jmj?zm00000NkvXXu0mjf^AC2a literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/bg_room_pk_bottom.xml b/app/src/main/res/drawable/bg_room_pk_bottom.xml index 1e9fd2b47..b99276981 100644 --- a/app/src/main/res/drawable/bg_room_pk_bottom.xml +++ b/app/src/main/res/drawable/bg_room_pk_bottom.xml @@ -2,8 +2,8 @@ diff --git a/app/src/main/res/drawable/bg_room_pk_common_btn.xml b/app/src/main/res/drawable/bg_room_pk_common_btn.xml index 0cc6aefc8..a686f290c 100644 --- a/app/src/main/res/drawable/bg_room_pk_common_btn.xml +++ b/app/src/main/res/drawable/bg_room_pk_common_btn.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/drawable/bg_room_pk_rb.xml b/app/src/main/res/drawable/bg_room_pk_rb.xml index 8fdc7b080..a42275bfe 100644 --- a/app/src/main/res/drawable/bg_room_pk_rb.xml +++ b/app/src/main/res/drawable/bg_room_pk_rb.xml @@ -5,8 +5,8 @@ @@ -15,7 +15,7 @@ - + diff --git a/app/src/main/res/layout/activity_room_pk_create.xml b/app/src/main/res/layout/activity_room_pk_create.xml index 1e3581610..e9b58f303 100644 --- a/app/src/main/res/layout/activity_room_pk_create.xml +++ b/app/src/main/res/layout/activity_room_pk_create.xml @@ -190,7 +190,7 @@ android:paddingStart="20dp" android:paddingEnd="50dp" android:textColor="@color/text_title_white" - android:textColorHint="@color/white_transparent_50" + android:textColorHint="@color/color_666666" android:textSize="15dp" app:layout_constraintStart_toStartOf="@id/rg" app:layout_constraintTop_toBottomOf="@id/rg" /> @@ -212,7 +212,7 @@ android:layout_height="wrap_content" android:layout_marginTop="40dp" android:text="PK玩法" - android:textColor="#ffffffff" + android:textColor="@color/text_title_white" android:textSize="16sp" app:layout_constraintEnd_toEndOf="@id/tv_pk_time" app:layout_constraintTop_toBottomOf="@id/edit_time" /> @@ -228,7 +228,7 @@ android:paddingStart="20dp" android:paddingEnd="50dp" android:textColor="@color/text_title_white" - android:textColorHint="@color/white_transparent_50" + android:textColorHint="@color/color_666666" android:textSize="15sp" app:layout_constraintBottom_toBottomOf="@id/tv_pk_desc" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/activity_room_pk_search.xml b/app/src/main/res/layout/activity_room_pk_search.xml index 71377c87a..d5eea4482 100644 --- a/app/src/main/res/layout/activity_room_pk_search.xml +++ b/app/src/main/res/layout/activity_room_pk_search.xml @@ -19,7 +19,7 @@ android:layout_height="40dp" android:layout_marginTop="16dp" android:scaleType="center" - android:src="@drawable/arrow_left_white" + android:src="@drawable/arrow_left" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -30,14 +30,14 @@ android:layout_marginStart="3dp" android:layout_marginTop="16dp" android:layout_marginEnd="12dp" - android:background="@drawable/bg_room_pk_search_edit" + android:background="@drawable/bg_room_pk_common_btn" android:hint="请输入大鹅号" android:inputType="number" android:maxLength="15" android:paddingStart="20dp" android:paddingEnd="50dp" android:textColor="@color/text_title_white" - android:textColorHint="@color/white_transparent_40" + android:textColorHint="@color/color_666666" android:textSize="15sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/iv_back" @@ -54,7 +54,6 @@ app:layout_constraintEnd_toEndOf="@id/edit_search" app:layout_constraintTop_toTopOf="@id/edit_search" /> - - + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_chatroom_game_main.xml b/app/src/main/res/layout/fragment_chatroom_game_main.xml index bb84b3e9d..6aa659ced 100644 --- a/app/src/main/res/layout/fragment_chatroom_game_main.xml +++ b/app/src/main/res/layout/fragment_chatroom_game_main.xml @@ -155,15 +155,28 @@ android:visibility="gone" tools:visibility="visible"> - + android:orientation="horizontal"> + + + + + +