moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:完成房间标题栏目

Browse Source
This commit is contained in:
Max
2023-11-25 18:39:35 +08:00
parent 99451e9bc4
commit fefcc5260a
11 changed files with 328 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

229
app/src/main/java/com/chwl/app/avroom/fragment/HomePartyFragment.java
View File

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

BIN
app/src/main/res/drawable-xhdpi/ic_high_audio.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 400 B

BIN
app/src/main/res/drawable-xhdpi/icon_room_good_number.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 736 B

BIN
app/src/main/res/drawable-xhdpi/icon_room_more.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB

8
app/src/main/res/drawable/bg_room_collect_button.xml
View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/color_67D7D7" />
<corners android:radius="@dimen/dp_12" />
</shape>

6
app/src/main/res/drawable/bg_room_have_collect_button.xml
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#4dffffff" />
<corners android:radius="@dimen/dp_12" />
</shape>

14
app/src/main/res/drawable/room_ic_collect_no.xml Normal file
View File

@@ -0,0 +1,14 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="22dp"
android:height="22dp"
android:viewportWidth="22"
android:viewportHeight="22">
<path
android:pathData="M0,0h22v22h-22z"
android:strokeAlpha="0.04122002"
android:fillColor="#FFFFFF"
android:fillAlpha="4.122002E-4"/>
<path
android:pathData="M14.044,7.575L19.991,7.521Q20.089,7.52 20.186,7.538Q20.283,7.557 20.374,7.594Q20.466,7.631 20.548,7.685Q20.63,7.739 20.701,7.808Q20.771,7.877 20.826,7.958Q20.882,8.039 20.92,8.13Q20.959,8.221 20.979,8.317Q20.999,8.413 21,8.512Q21.002,8.704 20.932,8.884Q20.862,9.063 20.731,9.204L16.596,13.629L15.865,12.946L16.859,12.834L17.542,18.888Q17.553,18.986 17.545,19.084Q17.537,19.182 17.509,19.277Q17.482,19.371 17.437,19.459Q17.392,19.546 17.33,19.623Q17.269,19.7 17.194,19.764Q17.119,19.827 17.032,19.875Q16.946,19.923 16.852,19.953Q16.758,19.983 16.661,19.994Q16.359,20.028 16.09,19.889L10.541,17.027L10.999,16.139L11.465,17.024L6.021,19.885Q5.934,19.931 5.84,19.959Q5.745,19.987 5.647,19.996Q5.549,20.005 5.451,19.994Q5.353,19.984 5.259,19.955Q5.165,19.926 5.078,19.879Q4.992,19.832 4.916,19.769Q4.84,19.706 4.778,19.629Q4.717,19.552 4.671,19.465Q4.6,19.33 4.572,19.181Q4.545,19.031 4.563,18.879L5.298,12.826L6.29,12.946L5.564,13.634L1.377,9.208Q1.31,9.137 1.257,9.053Q1.205,8.97 1.17,8.878Q1.135,8.786 1.118,8.689Q1.102,8.592 1.104,8.493Q1.107,8.395 1.129,8.299Q1.151,8.203 1.191,8.113Q1.231,8.023 1.288,7.943Q1.345,7.862 1.417,7.795Q1.63,7.592 1.919,7.538L7.964,6.404L8.149,7.387L7.265,6.919L10.116,1.532Q10.162,1.445 10.224,1.369Q10.286,1.292 10.362,1.23Q10.438,1.167 10.524,1.12Q10.611,1.073 10.705,1.044Q10.799,1.015 10.897,1.005Q10.995,0.995 11.093,1.004Q11.191,1.014 11.286,1.042Q11.38,1.07 11.467,1.116Q11.725,1.252 11.869,1.506L13.147,3.753L11.408,4.742L10.13,2.494L10.999,2L11.883,2.468L9.033,7.854Q8.98,7.954 8.906,8.04Q8.832,8.125 8.742,8.192Q8.651,8.259 8.547,8.304Q8.444,8.349 8.333,8.37L2.288,9.504L2.104,8.521L2.83,7.834L7.017,12.259Q7.093,12.339 7.149,12.434Q7.206,12.528 7.24,12.633Q7.275,12.738 7.286,12.848Q7.296,12.957 7.283,13.067L6.549,19.121L5.556,19L5.091,18.115L10.534,15.253Q10.641,15.197 10.758,15.168Q10.875,15.139 10.995,15.139Q11.116,15.138 11.233,15.166Q11.35,15.195 11.458,15.25L17.007,18.111L16.548,19L15.555,19.112L14.871,13.059Q14.859,12.951 14.87,12.843Q14.882,12.735 14.916,12.632Q14.95,12.529 15.005,12.436Q15.06,12.343 15.134,12.264L19.269,7.838L20,8.521L20.009,9.521L14.062,9.575L14.044,7.575ZM15.053,8.575Q15.053,8.673 15.034,8.77Q15.015,8.867 14.977,8.958Q14.939,9.049 14.884,9.13Q14.83,9.212 14.76,9.282Q14.69,9.352 14.609,9.406Q14.527,9.461 14.436,9.499Q14.345,9.536 14.248,9.556Q14.151,9.575 14.053,9.575Q13.954,9.575 13.858,9.556Q13.761,9.536 13.67,9.499Q13.579,9.461 13.497,9.406Q13.416,9.352 13.346,9.282Q13.276,9.212 13.221,9.13Q13.167,9.049 13.129,8.958Q13.091,8.867 13.072,8.77Q13.053,8.673 13.053,8.575Q13.053,8.476 13.072,8.38Q13.091,8.283 13.129,8.192Q13.167,8.101 13.221,8.019Q13.276,7.937 13.346,7.868Q13.416,7.798 13.497,7.743Q13.579,7.689 13.67,7.651Q13.761,7.613 13.858,7.594Q13.954,7.575 14.053,7.575Q14.151,7.575 14.248,7.594Q14.345,7.613 14.436,7.651Q14.527,7.689 14.609,7.743Q14.69,7.798 14.76,7.868Q14.83,7.937 14.884,8.019Q14.939,8.101 14.977,8.192Q15.015,8.283 15.034,8.38Q15.053,8.476 15.053,8.575ZM13.278,4.248Q13.278,4.346 13.259,4.443Q13.239,4.539 13.202,4.63Q13.164,4.721 13.109,4.803Q13.054,4.885 12.985,4.955Q12.915,5.024 12.833,5.079Q12.751,5.134 12.66,5.172Q12.569,5.209 12.473,5.228Q12.376,5.248 12.278,5.248Q12.179,5.248 12.083,5.228Q11.986,5.209 11.895,5.172Q11.804,5.134 11.722,5.079Q11.64,5.024 11.571,4.955Q11.501,4.885 11.446,4.803Q11.391,4.721 11.354,4.63Q11.316,4.539 11.297,4.443Q11.278,4.346 11.278,4.248Q11.278,4.149 11.297,4.053Q11.316,3.956 11.354,3.865Q11.391,3.774 11.446,3.692Q11.501,3.61 11.571,3.541Q11.64,3.471 11.722,3.416Q11.804,3.361 11.895,3.324Q11.986,3.286 12.083,3.267Q12.179,3.248 12.278,3.248Q12.376,3.248 12.473,3.267Q12.569,3.286 12.66,3.324Q12.751,3.361 12.833,3.416Q12.915,3.471 12.985,3.541Q13.054,3.61 13.109,3.692Q13.164,3.774 13.202,3.865Q13.239,3.956 13.259,4.053Q13.278,4.149 13.278,4.248Z"
android:fillColor="#FFFFFF"/>
</vector>

89
app/src/main/res/drawable/room_ic_collect_yes.xml Normal file
View File

@@ -0,0 +1,89 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="22dp"
android:height="22dp"
android:viewportWidth="22"
android:viewportHeight="22">
<path
android:pathData="M11.063,17.52L5.956,19.936C5.456,20.172 4.86,19.959 4.624,19.46C4.542,19.287 4.512,19.095 4.536,18.905L5.256,13.301L5.256,13.301L1.38,9.19C1.001,8.788 1.019,8.155 1.421,7.776C1.56,7.645 1.734,7.557 1.922,7.521L7.474,6.474L7.474,6.474L10.186,1.517C10.451,1.033 11.059,0.855 11.543,1.12C11.711,1.212 11.849,1.35 11.94,1.517L14.652,6.474L14.652,6.474L20.204,7.521C20.747,7.624 21.104,8.147 21.002,8.69C20.966,8.877 20.878,9.051 20.747,9.19L16.871,13.301L16.871,13.301L17.59,18.905C17.66,19.453 17.273,19.954 16.725,20.024C16.536,20.048 16.343,20.018 16.171,19.936L11.063,17.52L11.063,17.52Z"
android:strokeWidth="1"
android:fillType="evenOdd"
android:strokeColor="#00000000">
<aapt:attr name="android:fillColor">
<gradient
android:startX="6.215"
android:startY="4.872"
android:endX="17.679"
android:endY="17.063"
android:type="linear">
<item android:offset="0" android:color="#FFFFD554"/>
<item android:offset="1" android:color="#FFFFA650"/>
</gradient>
</aapt:attr>
</path>
<group>
<clip-path
android:pathData="M11.063,17.52L5.956,19.936C5.456,20.172 4.86,19.959 4.624,19.46C4.542,19.287 4.512,19.095 4.536,18.905L5.256,13.301L5.256,13.301L1.38,9.19C1.001,8.788 1.019,8.155 1.421,7.776C1.56,7.645 1.734,7.557 1.922,7.521L7.474,6.474L7.474,6.474L10.186,1.517C10.451,1.033 11.059,0.855 11.543,1.12C11.711,1.212 11.849,1.35 11.94,1.517L14.652,6.474L14.652,6.474L20.204,7.521C20.747,7.624 21.104,8.147 21.002,8.69C20.966,8.877 20.878,9.051 20.747,9.19L16.871,13.301L16.871,13.301L17.59,18.905C17.66,19.453 17.273,19.954 16.725,20.024C16.536,20.048 16.343,20.018 16.171,19.936L11.063,17.52L11.063,17.52Z"/>
<path
android:pathData="M11,15.248L7.95,16.691C7.451,16.927 6.854,16.714 6.618,16.214C6.537,16.042 6.506,15.849 6.53,15.659L6.96,12.313L6.96,12.313L4.645,9.858C4.266,9.456 4.285,8.823 4.687,8.444C4.826,8.313 5,8.224 5.187,8.189L8.503,7.563L8.503,7.563L10.123,4.603C10.388,4.119 10.996,3.941 11.48,4.206C11.648,4.298 11.786,4.436 11.877,4.603L13.497,7.563L13.497,7.563L16.813,8.189C17.355,8.291 17.712,8.814 17.61,9.357C17.574,9.545 17.486,9.719 17.355,9.858L15.04,12.313L15.04,12.313L15.47,15.659C15.54,16.207 15.153,16.708 14.605,16.779C14.415,16.803 14.223,16.772 14.05,16.691L11,15.248L11,15.248Z"
android:strokeAlpha="0.8152253"
android:strokeWidth="1"
android:fillType="evenOdd"
android:strokeColor="#00000000"
android:fillAlpha="0.8152253">
<aapt:attr name="android:fillColor">
<gradient
android:startX="10.29"
android:startY="3.941"
android:endX="14.592"
android:endY="12.066"
android:type="linear">
<item android:offset="0" android:color="#51FFFFFF"/>
<item android:offset="1" android:color="#00FF8209"/>
</gradient>
</aapt:attr>
</path>
</group>
<group>
<clip-path
android:pathData="M11.063,17.52L5.956,19.936C5.456,20.172 4.86,19.959 4.624,19.46C4.542,19.287 4.512,19.095 4.536,18.905L5.256,13.301L5.256,13.301L1.38,9.19C1.001,8.788 1.019,8.155 1.421,7.776C1.56,7.645 1.734,7.557 1.922,7.521L7.474,6.474L7.474,6.474L10.186,1.517C10.451,1.033 11.059,0.855 11.543,1.12C11.711,1.212 11.849,1.35 11.94,1.517L14.652,6.474L14.652,6.474L20.204,7.521C20.747,7.624 21.104,8.147 21.002,8.69C20.966,8.877 20.878,9.051 20.747,9.19L16.871,13.301L16.871,13.301L17.59,18.905C17.66,19.453 17.273,19.954 16.725,20.024C16.536,20.048 16.343,20.018 16.171,19.936L11.063,17.52L11.063,17.52Z"/>
<path
android:pathData="M7.005,17.1C8.849,14.829 10.603,14.072 12.266,14.829C14.76,15.965 15.73,17.931 15.73,17.931C15.73,17.931 13.426,18.399 8.817,19.334L7.005,17.1Z"
android:strokeWidth="1"
android:fillType="evenOdd"
android:strokeColor="#00000000">
<aapt:attr name="android:fillColor">
<gradient
android:startX="11.367"
android:startY="13.622"
android:endX="11.367"
android:endY="15.991"
android:type="linear">
<item android:offset="0" android:color="#FFFF9B44"/>
<item android:offset="1" android:color="#00FFB25F"/>
</gradient>
</aapt:attr>
</path>
</group>
<group>
<clip-path
android:pathData="M11.063,17.52L5.956,19.936C5.456,20.172 4.86,19.959 4.624,19.46C4.542,19.287 4.512,19.095 4.536,18.905L5.256,13.301L5.256,13.301L1.38,9.19C1.001,8.788 1.019,8.155 1.421,7.776C1.56,7.645 1.734,7.557 1.922,7.521L7.474,6.474L7.474,6.474L10.186,1.517C10.451,1.033 11.059,0.855 11.543,1.12C11.711,1.212 11.849,1.35 11.94,1.517L14.652,6.474L14.652,6.474L20.204,7.521C20.747,7.624 21.104,8.147 21.002,8.69C20.966,8.877 20.878,9.051 20.747,9.19L16.871,13.301L16.871,13.301L17.59,18.905C17.66,19.453 17.273,19.954 16.725,20.024C16.536,20.048 16.343,20.018 16.171,19.936L11.063,17.52L11.063,17.52Z"/>
<path
android:pathData="M10.037,4.714C9.699,7.297 8.962,8.589 7.825,8.589C6.688,8.589 5.042,8.589 2.889,8.589C4.752,8.694 6.398,8.359 7.825,7.586C9.252,6.812 9.989,5.855 10.037,4.714Z"
android:strokeWidth="1"
android:fillType="evenOdd"
android:strokeColor="#00000000">
<aapt:attr name="android:fillColor">
<gradient
android:startX="8.706"
android:startY="7.294"
android:endX="7.913"
android:endY="6.874"
android:type="linear">
<item android:offset="0" android:color="#FFFFFFFF"/>
<item android:offset="1" android:color="#00D8D8D8"/>
</gradient>
</aapt:attr>
</path>
</group>
</vector>

22
app/src/main/res/drawable/room_ic_more.xml Normal file
View File

@@ -0,0 +1,22 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="22dp"
android:height="22dp"
android:viewportWidth="22"
android:viewportHeight="22">
<path
android:pathData="M22.787,23.002l-21.506,-0l0,-21.72l21.506,0z"
android:fillColor="#FFFFFF"
android:fillAlpha="0.01"/>
<path
android:pathData="M20.59,15.381Q20.017,19.04 15.153,20.828Q13.372,21.483 11.493,21.386Q9.68,21.292 8.028,20.514Q6.377,19.736 5.142,18.395Q3.864,17.007 3.217,15.213Q2.571,13.42 2.666,11.528Q2.759,9.702 3.527,8.038Q4.296,6.373 5.623,5.126Q6.999,3.833 8.779,3.179Q10.559,2.525 12.438,2.622Q14.251,2.715 15.903,3.493Q17.554,4.271 18.789,5.612Q20.068,7 20.714,8.794L18.833,9.472Q17.796,6.595 15.051,5.303Q12.31,4.012 9.469,5.056Q6.624,6.102 5.343,8.876Q4.061,11.654 5.099,14.535Q6.135,17.412 8.88,18.705Q11.621,19.995 14.462,18.951Q18.223,17.569 18.614,15.072L20.59,15.381ZM19.26,14.287Q19.353,14.253 19.45,14.238Q19.547,14.223 19.646,14.228Q19.744,14.232 19.84,14.255Q19.935,14.279 20.025,14.32Q20.114,14.362 20.193,14.42Q20.273,14.478 20.339,14.551Q20.406,14.624 20.457,14.708Q20.508,14.792 20.542,14.885Q20.575,14.977 20.59,15.074Q20.605,15.172 20.601,15.27Q20.597,15.369 20.573,15.464Q20.55,15.56 20.508,15.649Q20.467,15.739 20.408,15.818Q20.35,15.897 20.278,15.964Q20.205,16.03 20.121,16.082Q20.037,16.133 19.944,16.166Q19.851,16.2 19.754,16.215Q19.657,16.23 19.558,16.226Q19.46,16.221 19.364,16.198Q19.269,16.175 19.179,16.133Q19.09,16.091 19.011,16.033Q18.931,15.975 18.865,15.902Q18.798,15.83 18.747,15.745Q18.696,15.661 18.662,15.569Q18.629,15.476 18.614,15.379Q18.599,15.281 18.603,15.183Q18.607,15.085 18.631,14.989Q18.654,14.893 18.696,14.804Q18.737,14.715 18.796,14.635Q18.854,14.556 18.926,14.489Q18.999,14.423 19.083,14.372Q19.167,14.321 19.26,14.287ZM19.432,8.194Q19.524,8.16 19.621,8.145Q19.719,8.13 19.817,8.134Q19.916,8.139 20.011,8.162Q20.107,8.186 20.196,8.227Q20.285,8.269 20.365,8.327Q20.444,8.385 20.511,8.458Q20.577,8.53 20.628,8.615Q20.68,8.699 20.713,8.791Q20.747,8.884 20.762,8.981Q20.777,9.079 20.773,9.177Q20.768,9.275 20.745,9.371Q20.722,9.467 20.68,9.556Q20.638,9.645 20.58,9.725Q20.522,9.804 20.449,9.871Q20.377,9.937 20.292,9.988Q20.208,10.039 20.116,10.073Q20.023,10.107 19.926,10.122Q19.828,10.137 19.73,10.133Q19.632,10.128 19.536,10.105Q19.44,10.081 19.351,10.04Q19.262,9.998 19.182,9.94Q19.103,9.882 19.036,9.809Q18.97,9.736 18.919,9.652Q18.868,9.568 18.834,9.475Q18.8,9.383 18.785,9.286Q18.77,9.188 18.774,9.09Q18.779,8.991 18.802,8.896Q18.826,8.8 18.867,8.711Q18.909,8.622 18.967,8.542Q19.025,8.463 19.098,8.396Q19.171,8.33 19.255,8.279Q19.339,8.227 19.432,8.194Z"
android:fillColor="#FFFFFF"/>
<path
android:pathData="M15.317,12.191C15.317,13.135 16.09,13.901 17.044,13.901C17.999,13.901 18.772,13.135 18.772,12.191C18.772,11.246 17.999,10.48 17.044,10.48C16.09,10.48 15.317,11.246 15.317,12.191Z"
android:fillColor="#FFFFFF"/>
<path
android:pathData="M12.35,10.48a1.711,1.728 90,1 0,-0 3.421a1.711,1.728 90,1 0,0 -3.421z"
android:fillColor="#FFFFFF"/>
<path
android:pathData="M5.928,12.191C5.928,13.135 6.702,13.901 7.656,13.901C8.61,13.901 9.384,13.135 9.384,12.191C9.384,11.246 8.61,10.48 7.656,10.48C6.702,10.48 5.928,11.246 5.928,12.191Z"
android:fillColor="#FFFFFF"/>
</vector>

185
app/src/main/res/layout/fragment_chatroom_game_main.xml
View File

@@ -36,23 +36,24 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="40dp"
android:layout_height="@dimen/dp_40"
android:layout_marginTop="@dimen/dp_44"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_back"
android:layout_width="32dp"
android:layout_height="32dp"
android:scaleType="center"
android:layout_marginStart="5dp"
android:scaleType="center"
android:src="@drawable/arrow_left_white" />
<LinearLayout
android:id="@+id/ll_room_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:layout_marginStart="@dimen/dp_5"
android:orientation="vertical">
<LinearLayout
@@ -72,21 +73,12 @@
android:focusableInTouchMode="true"
android:gravity="center_vertical"
android:marqueeRepeatLimit="marquee_forever"
android:maxWidth="150dp"
android:maxWidth="200dp"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="15sp"
android:textSize="@dimen/dp_15"
tools:text="@string/layout_fragment_chatroom_game_main_02" />
<ImageView
android:id="@+id/iv_high_audio"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_5"
android:src="@drawable/ic_high_audio"
android:visibility="gone"
tools:visibility="visible" />
<ImageView
android:id="@+id/iv_close_gift"
android:layout_width="wrap_content"
@@ -100,24 +92,30 @@
android:id="@+id/layout_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_good_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="5dp"
android:src="@drawable/icon_room_good_number"
android:visibility="gone"
tools:visibility="visible" />
<!-- <androidx.appcompat.widget.AppCompatImageView-->
<!-- android:id="@+id/iv_good_number"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_gravity="center_vertical"-->
<!-- android:layout_marginEnd="5dp"-->
<!-- android:src="@drawable/icon_room_good_number"-->
<!-- android:visibility="gone"-->
<!-- tools:visibility="visible" />-->
<com.chwl.app.common.widget.CircleImageView
android:layout_width="@dimen/dp_3"
android:layout_height="@dimen/dp_3"
android:src="#3EFED7" />
<TextView
android:id="@+id/room_nums"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:textColor="@color/white_transparent_50"
android:layout_marginStart="@dimen/dp_3"
android:textColor="@color/color_FFFFFF"
android:textSize="@dimen/sp_10"
tools:text="@string/layout_fragment_chatroom_game_main_03" />
@@ -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 @@
</LinearLayout>
<TextView
android:id="@+id/iv_follow_room"
android:text="@string/room_collect"
android:textSize="@dimen/sp_12"
android:textColor="@color/white"
android:gravity="center"
android:background="@drawable/bg_room_collect_button"
android:layout_marginTop="@dimen/dp_2"
android:layout_width="52dp"
android:layout_height="23dp"/>
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<LinearLayout
android:id="@+id/ll_change_game"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginEnd="6dp"
android:background="@drawable/bg_room_select_game"
android:orientation="vertical"
android:paddingStart="8dp"
android:paddingTop="2dp"
android:paddingEnd="8dp"
android:paddingBottom="2dp"
android:visibility="gone"
tools:visibility="visible">
<!-- <LinearLayout-->
<!-- android:id="@+id/ll_change_game"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="5dp"-->
<!-- android:layout_marginEnd="6dp"-->
<!-- android:background="@drawable/bg_room_select_game"-->
<!-- android:orientation="vertical"-->
<!-- android:paddingStart="8dp"-->
<!-- android:paddingTop="2dp"-->
<!-- android:paddingEnd="8dp"-->
<!-- android:paddingBottom="2dp"-->
<!-- android:visibility="gone"-->
<!-- tools:visibility="visible">-->
<LinearLayout
android:id="@+id/ll_select_game"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal">
<!-- <LinearLayout-->
<!-- android:id="@+id/ll_select_game"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:gravity="center"-->
<!-- android:orientation="horizontal">-->
<TextView
android:id="@+id/tv_curr_game"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:includeFontPadding="true"
android:textColor="@color/white"
android:textSize="15sp"
tools:text="@string/layout_fragment_chatroom_game_main_04" />
<!-- <TextView-->
<!-- android:id="@+id/tv_curr_game"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:gravity="center"-->
<!-- android:includeFontPadding="true"-->
<!-- android:textColor="@color/white"-->
<!-- android:textSize="15sp"-->
<!-- tools:text="@string/layout_fragment_chatroom_game_main_04" />-->
<ImageView
android:id="@+id/iv_change_game_arrow"
android:layout_width="20dp"
android:layout_height="10dp"
android:scaleType="center"
android:src="@drawable/ic_room_arrow_type_below" />
<!-- <ImageView-->
<!-- android:id="@+id/iv_change_game_arrow"-->
<!-- android:layout_width="20dp"-->
<!-- android:layout_height="10dp"-->
<!-- android:scaleType="center"-->
<!-- android:src="@drawable/ic_room_arrow_type_below" />-->
</LinearLayout>
<!-- </LinearLayout>-->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_game"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="4dp"
android:visibility="gone" />
<!-- <androidx.recyclerview.widget.RecyclerView-->
<!-- android:id="@+id/rv_game"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:paddingBottom="4dp"-->
<!-- android:visibility="gone" />-->
</LinearLayout>
<!-- </LinearLayout>-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_room_share"-->
<!-- android:layout_width="@dimen/dp_20"-->
<!-- android:layout_height="@dimen/dp_20"-->
<!-- android:layout_marginTop="7dp"-->
<!-- android:layout_marginEnd="@dimen/dp_12"-->
<!-- android:scaleType="center"-->
<!-- android:src="@drawable/ic_share_white"-->
<!-- android:visibility="gone" />-->
<ImageView
android:visibility="gone"
android:id="@+id/iv_room_share"
android:layout_width="@dimen/dp_20"
android:layout_height="@dimen/dp_20"
android:layout_marginTop="7dp"
android:layout_marginEnd="@dimen/dp_12"
android:scaleType="center"
android:src="@drawable/ic_share_white" />
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" />
<ImageView
android:id="@+id/room_more"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginTop="7dp"
android:layout_marginEnd="14dp"
android:scaleType="center"
android:src="@drawable/icon_room_more" />
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" />
</LinearLayout>

14
app/src/main/res/layout/item_boss_micro.xml
View File

@@ -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 @@
</FrameLayout>
<ImageView
android:id="@+id/iv_red_package"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:scaleType="centerInside"
android:src="@drawable/room_red_package_in"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="gone" />
</androidx.constraintlayout.widget.ConstraintLayout>