diff --git a/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java b/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java index 88f4069d7..6d3747e04 100644 --- a/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java +++ b/app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java @@ -92,11 +92,11 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe private TextView roomTitle; private TextView roomId; - private TextView ivFollowRoom; - private AppCompatImageView mIvGoodNumber; + private ImageView ivFollowRoom; +// private AppCompatImageView mIvGoodNumber; private ImageView roomMore; - private ImageView ivRoomShare; +// private ImageView ivRoomShare; private GiftV2View giftView; private ViewStub mVsGift2View; private RoomEffectView mRoomEffectView; @@ -107,11 +107,11 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe private UserInfo mUserInfo; private FragmentChatroomGameMainBinding gameMainBinding; - private ShareDialog shareDialog; +// private ShareDialog shareDialog; //收藏房间 private String FOLLOW_ROOM_TYPE = ""; - private SelectGameAdapter gameAdapter; +// private SelectGameAdapter gameAdapter; public static HomePartyFragment newInstance() { @@ -169,7 +169,7 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe roomTitle = mView.findViewById(R.id.room_title); setupRoomTitleMarquee(); roomMore = mView.findViewById(R.id.room_more); - ivRoomShare = mView.findViewById(R.id.iv_room_share); +// ivRoomShare = mView.findViewById(R.id.iv_room_share); // if (SuperAdminUtil.isSuperAdmin()) { // ivRoomShare.setVisibility(View.INVISIBLE); // } else { @@ -177,7 +177,7 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe // } roomId = mView.findViewById(R.id.room_id); mVsGift2View = mView.findViewById(R.id.vs_gift_view); - mIvGoodNumber = mView.findViewById(R.id.iv_good_number); +// mIvGoodNumber = mView.findViewById(R.id.iv_good_number); ivFollowRoom = mView.findViewById(R.id.iv_follow_room); svgaRoomBg = mView.findViewById(R.id.svga_image_view_bg); mRoomEffectView = mView.findViewById(R.id.room_effect_view); @@ -209,7 +209,7 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe public void onSetListener() { roomMore.setOnClickListener(this); ivFollowRoom.setOnClickListener(this); - ivRoomShare.setOnClickListener(this); +// ivRoomShare.setOnClickListener(this); gameMainBinding.llRoomInfo.setOnClickListener(this); gameMainBinding.ivBack.setOnClickListener(this); @@ -231,59 +231,59 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe } } - private void initRvGame() { - RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo; - if (roomInfo == null || gameAdapter != null) return; - gameMainBinding.rvGame.setLayoutManager(new LinearLayoutManager(mContext)); - gameMainBinding.rvGame.setAdapter(gameAdapter = new SelectGameAdapter()); - gameMainBinding.llSelectGame.setOnClickListener(v -> { - if (gameMainBinding.rvGame.getVisibility() == View.VISIBLE) { - gameMainBinding.rvGame.setVisibility(View.GONE); - gameMainBinding.ivChangeGameArrow.setImageResource(R.drawable.ic_room_arrow_type_below); - } else { - if (!isShowChangeGame()) { - SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_fragment_homepartyfragment_01)); - return; - } - if (AvRoomDataManager.get().isGamePlaying()) { - SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_fragment_homepartyfragment_02)); - } else { - gameMainBinding.rvGame.setVisibility(View.VISIBLE); - gameMainBinding.ivChangeGameArrow.setImageResource(R.drawable.ic_room_arrow_type); - } - } - }); - - gameAdapter.setOnItemClickListener((adapter, view, position) -> { - if (AvRoomDataManager.get().isGamePlaying()) { - SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_fragment_homepartyfragment_03)); - } - if (!isShowChangeGame()) { - SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_fragment_homepartyfragment_04)); - return; - } - - GameInfo gameInfo = gameAdapter.getItem(position); - if (gameInfo != null) { - int type; - long mgId = 0; - if (Objects.equals(ResUtil.getString(R.string.avroom_fragment_homepartyfragment_05), gameInfo.getName())) { - type = RoomInfo.ROOMTYPE_HOME_PARTY; - } else { - type = RoomInfo.ROOMTYPE_GAME; - mgId = JavaUtil.str2long(gameInfo.getMgId()); - } - gameMainBinding.rvGame.setVisibility(View.GONE); - gameMainBinding.ivChangeGameArrow.setImageResource(R.drawable.ic_room_arrow_type_below); - OpenRoomHelper.updateRoomInfo( - getBaseActivity(), - AvRoomDataManager.get().mCurrentRoomInfo, - type, - mgId, - false); - } - }); - } +// private void initRvGame() { +// RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo; +// if (roomInfo == null || gameAdapter != null) return; +// gameMainBinding.rvGame.setLayoutManager(new LinearLayoutManager(mContext)); +// gameMainBinding.rvGame.setAdapter(gameAdapter = new SelectGameAdapter()); +// gameMainBinding.llSelectGame.setOnClickListener(v -> { +// if (gameMainBinding.rvGame.getVisibility() == View.VISIBLE) { +// gameMainBinding.rvGame.setVisibility(View.GONE); +// gameMainBinding.ivChangeGameArrow.setImageResource(R.drawable.ic_room_arrow_type_below); +// } else { +// if (!isShowChangeGame()) { +// SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_fragment_homepartyfragment_01)); +// return; +// } +// if (AvRoomDataManager.get().isGamePlaying()) { +// SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_fragment_homepartyfragment_02)); +// } else { +// gameMainBinding.rvGame.setVisibility(View.VISIBLE); +// gameMainBinding.ivChangeGameArrow.setImageResource(R.drawable.ic_room_arrow_type); +// } +// } +// }); +// +// gameAdapter.setOnItemClickListener((adapter, view, position) -> { +// if (AvRoomDataManager.get().isGamePlaying()) { +// SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_fragment_homepartyfragment_03)); +// } +// if (!isShowChangeGame()) { +// SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_fragment_homepartyfragment_04)); +// return; +// } +// +// GameInfo gameInfo = gameAdapter.getItem(position); +// if (gameInfo != null) { +// int type; +// long mgId = 0; +// if (Objects.equals(ResUtil.getString(R.string.avroom_fragment_homepartyfragment_05), gameInfo.getName())) { +// type = RoomInfo.ROOMTYPE_HOME_PARTY; +// } else { +// type = RoomInfo.ROOMTYPE_GAME; +// mgId = JavaUtil.str2long(gameInfo.getMgId()); +// } +// gameMainBinding.rvGame.setVisibility(View.GONE); +// gameMainBinding.ivChangeGameArrow.setImageResource(R.drawable.ic_room_arrow_type_below); +// OpenRoomHelper.updateRoomInfo( +// getBaseActivity(), +// AvRoomDataManager.get().mCurrentRoomInfo, +// type, +// mgId, +// false); +// } +// }); +// } //这里的2和4是服务端定义的错误状态 关闭排麦模式和关闭PK模式! private boolean isShowChangeGame() { @@ -414,13 +414,13 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe public void onSuccess(UserInfo userInfo) { mUserInfo = userInfo; setRoomId(mUserInfo.getErbanNo(), roomInfo.onlineNum); - mIvGoodNumber.setVisibility(mUserInfo.isHasPrettyErbanNo() ? View.VISIBLE : View.GONE); +// mIvGoodNumber.setVisibility(mUserInfo.isHasPrettyErbanNo() ? View.VISIBLE : View.GONE); } @Override public void onError(Throwable e) { setRoomId(0, roomInfo.onlineNum); - mIvGoodNumber.setVisibility(View.GONE); +// mIvGoodNumber.setVisibility(View.GONE); } }); @@ -470,38 +470,37 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe ivFollowRoom.setVisibility(AvRoomDataManager.get().isRoomOwner() ? View.GONE : View.VISIBLE); FOLLOW_ROOM_TYPE = AvRoomDataManager.get().isRoomFans ? "2" : "1"; - ivFollowRoom.setBackground(AvRoomDataManager.get().isRoomFans ? ContextCompat.getDrawable(mContext, R.drawable.bg_room_have_collect_button) : ContextCompat.getDrawable(mContext, R.drawable.bg_room_collect_button)); - ivFollowRoom.setText(AvRoomDataManager.get().isRoomFans ? getString(R.string.room_have_collect) : getString(R.string.room_collect)); + ivFollowRoom.setImageResource(AvRoomDataManager.get().isRoomFans ? R.drawable.room_ic_collect_yes : R.drawable.room_ic_collect_no); setIdOnlineData(); - if (isShowChangeGame()) { - initRvGame(); - gameMainBinding.llChangeGame.setVisibility(View.VISIBLE); - if (AvRoomDataManager.get().isOpenGame()) { - gameMainBinding.tvCurrGame.setText(currentRoomInfo.getMgName()); - } else { - gameMainBinding.tvCurrGame.setText(ResUtil.getString(R.string.avroom_fragment_homepartyfragment_08)); - } - GameModel.INSTANCE.getGameList() - .compose(bindToLifecycle()) - .subscribe(gameInfos -> { - if (AvRoomDataManager.get().isOpenGame()) { - for (int i = 0; i < gameInfos.size(); i++) { - GameInfo gameInfo = gameInfos.get(i); - if (JavaUtil.str2long(gameInfo.getMgId()) == currentRoomInfo.getMgId()) { - gameInfos.remove(i); - break; - } - } - GameInfo gameInfo = new GameInfo(); - gameInfo.setName(ResUtil.getString(R.string.avroom_fragment_homepartyfragment_09)); - gameInfos.add(gameInfo); - } - gameAdapter.setNewData(gameInfos); - }); - } else { - gameMainBinding.llChangeGame.setVisibility(View.GONE); - } +// if (isShowChangeGame()) { +// initRvGame(); +// gameMainBinding.llChangeGame.setVisibility(View.VISIBLE); +// if (AvRoomDataManager.get().isOpenGame()) { +// gameMainBinding.tvCurrGame.setText(currentRoomInfo.getMgName()); +// } else { +// gameMainBinding.tvCurrGame.setText(ResUtil.getString(R.string.avroom_fragment_homepartyfragment_08)); +// } +// GameModel.INSTANCE.getGameList() +// .compose(bindToLifecycle()) +// .subscribe(gameInfos -> { +// if (AvRoomDataManager.get().isOpenGame()) { +// for (int i = 0; i < gameInfos.size(); i++) { +// GameInfo gameInfo = gameInfos.get(i); +// if (JavaUtil.str2long(gameInfo.getMgId()) == currentRoomInfo.getMgId()) { +// gameInfos.remove(i); +// break; +// } +// } +// GameInfo gameInfo = new GameInfo(); +// gameInfo.setName(ResUtil.getString(R.string.avroom_fragment_homepartyfragment_09)); +// gameInfos.add(gameInfo); +// } +// gameAdapter.setNewData(gameInfos); +// }); +// } else { +// gameMainBinding.llChangeGame.setVisibility(View.GONE); +// } } } @@ -530,9 +529,9 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe case R.id.ll_room_info: RoomOnlineUserActivity.start(getActivity()); break; - case R.id.iv_room_share: - shareRoom(); - break; +// case R.id.iv_room_share: +// shareRoom(); +// break; case R.id.iv_follow_room: followRoom(); break; @@ -568,8 +567,7 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe .subscribe(s -> { AvRoomDataManager.get().isRoomFans = !AvRoomDataManager.get().isRoomFans; FOLLOW_ROOM_TYPE = AvRoomDataManager.get().isRoomFans ? "2" : "1"; - ivFollowRoom.setBackground(AvRoomDataManager.get().isRoomFans ? ContextCompat.getDrawable(mContext, R.drawable.bg_room_have_collect_button) : ContextCompat.getDrawable(mContext, R.drawable.bg_room_collect_button)); - ivFollowRoom.setText(AvRoomDataManager.get().isRoomFans ? getString(R.string.room_have_collect) : getString(R.string.room_collect)); + ivFollowRoom.setImageResource(AvRoomDataManager.get().isRoomFans ? R.drawable.room_ic_collect_yes : R.drawable.room_ic_collect_no); if (AvRoomDataManager.get().isRoomFans) { SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_fragment_homepartyfragment_010)); PraiseModel.get().setFollowRoomSuccessRoomTip(currentRoomInfo.getUid()); @@ -580,30 +578,29 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe @Subscribe(threadMode = ThreadMode.MAIN) public void onFollowRoomEvent(FollowRoomEvent event) { - ivFollowRoom.setBackground(AvRoomDataManager.get().isRoomFans ? ContextCompat.getDrawable(mContext, R.drawable.bg_room_have_collect_button) : ContextCompat.getDrawable(mContext, R.drawable.bg_room_collect_button)); - ivFollowRoom.setText(AvRoomDataManager.get().isRoomFans ? getString(R.string.room_have_collect) : getString(R.string.room_collect)); + ivFollowRoom.setImageResource(AvRoomDataManager.get().isRoomFans ? R.drawable.room_ic_collect_yes : R.drawable.room_ic_collect_no); } - @Subscribe(threadMode = ThreadMode.MAIN) - public void onShareRoomEvent(ShareRoomEvent event) { - shareRoom(); - } +// @Subscribe(threadMode = ThreadMode.MAIN) +// public void onShareRoomEvent(ShareRoomEvent event) { +//// shareRoom(); +// } - /** - * 分享房间 - */ - public void shareRoom() { - if (shareDialog != null && shareDialog.isShowing()) { - shareDialog.dismiss(); - } - shareDialog = new ShareDialog(getActivity()); - shareDialog.setOnShareDialogItemClick(this); - shareDialog.show(); - } +// /** +// * 分享房间 +// */ +// public void shareRoom() { +// if (shareDialog != null && shareDialog.isShowing()) { +// shareDialog.dismiss(); +// } +// shareDialog = new ShareDialog(getActivity()); +// shareDialog.setOnShareDialogItemClick(this); +// shareDialog.show(); +// } @Override public void onInAppSharingItemClick() { - shareDialog.dismiss(); +// shareDialog.dismiss(); SelectFriendActivity.startForSharingRoom(getActivity()); } diff --git a/app/src/main/res/drawable-xhdpi/ic_high_audio.webp b/app/src/main/res/drawable-xhdpi/ic_high_audio.webp deleted file mode 100644 index 32973b74a..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_high_audio.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_room_good_number.webp b/app/src/main/res/drawable-xhdpi/icon_room_good_number.webp deleted file mode 100644 index 723f5a66f..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_room_good_number.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_room_more.webp b/app/src/main/res/drawable-xhdpi/icon_room_more.webp deleted file mode 100644 index 8e673d4dc..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_room_more.webp and /dev/null differ diff --git a/app/src/main/res/drawable/bg_room_collect_button.xml b/app/src/main/res/drawable/bg_room_collect_button.xml deleted file mode 100644 index 623afcb82..000000000 --- a/app/src/main/res/drawable/bg_room_collect_button.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_room_have_collect_button.xml b/app/src/main/res/drawable/bg_room_have_collect_button.xml deleted file mode 100644 index 2135ac713..000000000 --- a/app/src/main/res/drawable/bg_room_have_collect_button.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/room_ic_collect_no.xml b/app/src/main/res/drawable/room_ic_collect_no.xml new file mode 100644 index 000000000..0ec24e9bd --- /dev/null +++ b/app/src/main/res/drawable/room_ic_collect_no.xml @@ -0,0 +1,14 @@ + + + + diff --git a/app/src/main/res/drawable/room_ic_collect_yes.xml b/app/src/main/res/drawable/room_ic_collect_yes.xml new file mode 100644 index 000000000..b6bc67995 --- /dev/null +++ b/app/src/main/res/drawable/room_ic_collect_yes.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/room_ic_more.xml b/app/src/main/res/drawable/room_ic_more.xml new file mode 100644 index 000000000..158ac2bad --- /dev/null +++ b/app/src/main/res/drawable/room_ic_more.xml @@ -0,0 +1,22 @@ + + + + + + + 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 30bc6c511..2ad329ae4 100644 --- a/app/src/main/res/layout/fragment_chatroom_game_main.xml +++ b/app/src/main/res/layout/fragment_chatroom_game_main.xml @@ -36,23 +36,24 @@ - - - + + + + + + + + + + + @@ -125,8 +123,8 @@ android:id="@+id/room_id" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="5dp" - android:textColor="@color/white_transparent_50" + android:layout_marginStart="@dimen/dp_4" + android:textColor="@color/color_FFFFFF" android:textSize="@dimen/sp_10" tools:text="ID:8888" /> @@ -134,90 +132,85 @@ - - - + + + + + + + + + + + + + + - + + + + + + - + + + + + + + + + - + + + + + + - + - + + + + + + - + + + + + + + + + + + + android:id="@+id/iv_follow_room" + android:layout_width="@dimen/dp_32" + android:layout_height="@dimen/dp_32" + android:scaleType="centerInside" + android:src="@drawable/room_ic_collect_no" /> + android:layout_width="@dimen/dp_32" + android:layout_height="@dimen/dp_32" + android:layout_marginEnd="@dimen/dp_10" + android:scaleType="centerInside" + android:src="@drawable/room_ic_more" /> diff --git a/app/src/main/res/layout/item_boss_micro.xml b/app/src/main/res/layout/item_boss_micro.xml index 689d3a6bb..8050e75f2 100644 --- a/app/src/main/res/layout/item_boss_micro.xml +++ b/app/src/main/res/layout/item_boss_micro.xml @@ -13,7 +13,7 @@ android:id="@+id/micro_layout" android:layout_width="@dimen/dp_room_boss_mic_header_wear_radius" android:layout_height="@dimen/dp_room_boss_mic_header_wear_radius" - android:layout_marginStart="@dimen/dp_10" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> @@ -218,16 +218,4 @@ - - \ No newline at end of file