diff --git a/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkFinishDialog.kt b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkFinishDialog.kt index 394f55a91..0711e2614 100644 --- a/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkFinishDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkFinishDialog.kt @@ -48,7 +48,7 @@ class RoomPkFinishDialog : BaseDialog() { ) 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() { } 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( diff --git a/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkReceivedDialog.kt b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkReceivedDialog.kt index ec74f0094..15acf2efe 100644 --- a/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkReceivedDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkReceivedDialog.kt @@ -36,7 +36,7 @@ class RoomPkReceivedDialog : BaseDialog() { @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()) { diff --git a/app/src/main/java/com/chwl/app/avroom/dialog/RoomGameplayDialog.kt b/app/src/main/java/com/chwl/app/avroom/dialog/RoomGameplayDialog.kt index 2a82694ed..d3c959e9a 100644 --- a/app/src/main/java/com/chwl/app/avroom/dialog/RoomGameplayDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/dialog/RoomGameplayDialog.kt @@ -244,12 +244,12 @@ class RoomGameplayDialog : private fun getLocalList(): MutableList { val list = ArrayList() -// 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)) diff --git a/app/src/main/java/com/chwl/app/avroom/dialog/RoomOperationDialog.java b/app/src/main/java/com/chwl/app/avroom/dialog/RoomOperationDialog.java index 5aa3d595b..c30dfe8fc 100644 --- a/app/src/main/java/com/chwl/app/avroom/dialog/RoomOperationDialog.java +++ b/app/src/main/java/com/chwl/app/avroom/dialog/RoomOperationDialog.java @@ -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(); diff --git a/app/src/main/res/drawable-xxhdpi/room_gameplay_ic_room_pk.png b/app/src/main/res/drawable-xxhdpi/room_gameplay_ic_room_pk.png new file mode 100644 index 000000000..b341cc20a Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/room_gameplay_ic_room_pk.png differ diff --git a/app/src/main/res/drawable-xxhdpi/room_gameplay_ic_team_pk.png b/app/src/main/res/drawable-xxhdpi/room_gameplay_ic_team_pk.png new file mode 100644 index 000000000..c38685309 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/room_gameplay_ic_team_pk.png differ