feat:迁移PK入口到玩法列表
feat:部分UI微调
This commit is contained in:
@@ -48,7 +48,7 @@ class RoomPkFinishDialog : BaseDialog<DialogRoomPkFinishBinding>() {
|
||||
)
|
||||
|
||||
roomPkBean.csRank.getOrNull(0)?.let {
|
||||
binding?.tvNickContribute?.text = it.nick.subAndReplaceDot(15)
|
||||
binding?.tvNickContribute?.text = it.nick
|
||||
binding?.tvValueContribute?.text =
|
||||
context?.getString(R.string.layout_dialog_room_pk_finish_07, it.amount.toString())
|
||||
?: ""
|
||||
@@ -61,7 +61,7 @@ class RoomPkFinishDialog : BaseDialog<DialogRoomPkFinishBinding>() {
|
||||
}
|
||||
|
||||
roomPkBean.crRank.getOrNull(0)?.let {
|
||||
binding?.tvNickCharm?.text = it.nick.subAndReplaceDot(15)
|
||||
binding?.tvNickCharm?.text = it.nick
|
||||
binding?.tvValueCharm?.text =
|
||||
context?.getString(R.string.layout_activity_jewel_09, it.amount?.toString()) ?: ""
|
||||
ImageLoadUtils.loadImage(
|
||||
|
@@ -36,7 +36,7 @@ class RoomPkReceivedDialog : BaseDialog<DialogRoomPkReceivedBinding>() {
|
||||
|
||||
@SuppressLint("CheckResult")
|
||||
override fun init() {
|
||||
binding?.tvNick?.text = pkBean.inviteRoomTitle.subAndReplaceDot(15)
|
||||
binding?.tvNick?.text = pkBean.inviteRoomTitle
|
||||
binding?.tvTime?.text = "${pkBean.pkDuration}${getString(R.string.layout_activity_room_pk_create_010)}"
|
||||
val height: Int
|
||||
if (pkBean.pkDesc.isNullOrEmpty()) {
|
||||
|
@@ -244,12 +244,12 @@ class RoomGameplayDialog :
|
||||
|
||||
private fun getLocalList(): MutableList<RoomGameplayItem> {
|
||||
val list = ArrayList<RoomGameplayItem>()
|
||||
// getPkItem()?.let {
|
||||
// list.add(it)
|
||||
// }
|
||||
// getRoomPkItem()?.let {
|
||||
// list.add(it)
|
||||
// }
|
||||
getPkItem()?.let {
|
||||
list.add(it)
|
||||
}
|
||||
getRoomPkItem()?.let {
|
||||
list.add(it)
|
||||
}
|
||||
// getSingleRoomPkItem()?.let {
|
||||
// list.add(it)
|
||||
// }
|
||||
@@ -277,7 +277,7 @@ class RoomGameplayDialog :
|
||||
R.string.room_PK_mode
|
||||
)
|
||||
val icon =
|
||||
if (AvRoomDataManager.get().isOpenPKMode) R.drawable.ic_room_opt_op_pk else R.drawable.ic_room_opt_in_pk
|
||||
if (AvRoomDataManager.get().isOpenPKMode) R.drawable.room_gameplay_ic_team_pk else R.drawable.room_gameplay_ic_team_pk
|
||||
return RoomGameplayItem.CustomItem(str, icon) { dialog, item ->
|
||||
if (AvRoomDataManager.get().isDatingMode) {
|
||||
SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_dialog_roomoperationdialog_01))
|
||||
@@ -317,7 +317,7 @@ class RoomGameplayDialog :
|
||||
R.string.avroom_dialog_roomoperationdialog_04
|
||||
)
|
||||
val icon =
|
||||
if (AvRoomDataManager.get().isOpenAnotherPKMode) R.drawable.ic_room_opt_another_pk_in else R.drawable.ic_room_opt_another_pk_open
|
||||
if (AvRoomDataManager.get().isOpenAnotherPKMode) R.drawable.room_gameplay_ic_room_pk else R.drawable.room_gameplay_ic_room_pk
|
||||
return RoomGameplayItem.CustomItem(str, icon) { dialog, item ->
|
||||
if (AvRoomDataManager.get().isDatingMode) {
|
||||
SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_dialog_roomoperationdialog_05))
|
||||
|
@@ -115,8 +115,8 @@ public class RoomOperationDialog extends BottomSheetDialog {
|
||||
optAdapter = new OptAdapter(context, null);
|
||||
addRoomAlbum(optAdapter);
|
||||
addDatingAction(optAdapter);
|
||||
addPKAction(optAdapter);
|
||||
addRoomPKAction(optAdapter);
|
||||
// addPKAction(optAdapter);
|
||||
// addRoomPKAction(optAdapter);
|
||||
addSingleRoomPKAction(optAdapter);
|
||||
addSendBroadcastAction(optAdapter);
|
||||
// addInviteFansOptAdapter();
|
||||
|
BIN
app/src/main/res/drawable-xxhdpi/room_gameplay_ic_room_pk.png
Normal file
BIN
app/src/main/res/drawable-xxhdpi/room_gameplay_ic_room_pk.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 121 KiB |
BIN
app/src/main/res/drawable-xxhdpi/room_gameplay_ic_team_pk.png
Normal file
BIN
app/src/main/res/drawable-xxhdpi/room_gameplay_ic_team_pk.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 112 KiB |
Reference in New Issue
Block a user