From 27f488b66cc9dad284b886d43c6f9bcf56d6dfd7 Mon Sep 17 00:00:00 2001 From: eggmanQQQ <3671373519@qq.com> Date: Thu, 2 Jan 2025 11:11:52 +0800 Subject: [PATCH] =?UTF-8?q?fix=20:=20=20=E6=9B=BF=E6=8D=A2=E8=B5=84?= =?UTF-8?q?=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../avroom/activity/RoomTypeSwitchActivity.kt | 18 ++++++++-- .../chwl/app/avroom/adapter/UpMicAdapter.java | 5 ++- .../chwl/app/pay/activity/GiveGoldActivity.kt | 3 +- .../icon_room_up_micro_king.webp | Bin 2869 -> 5778 bytes .../main/res/drawable-xhdpi/icon_star_n.webp | Bin 0 -> 562 bytes .../main/res/drawable-xhdpi/icon_star_s.webp | Bin 0 -> 686 bytes .../layout/fragment_chatroom_game_main.xml | 2 +- app/src/main/res/layout/item_room_mode.xml | 34 ++++++++++++------ .../res/layout/room_type_switch_activity.xml | 2 +- app/src/main/res/values/strings.xml | 6 ++++ .../com/chwl/core/gift/bean/RoomMicDress.java | 1 + 11 files changed, 50 insertions(+), 21 deletions(-) create mode 100644 app/src/main/res/drawable-xhdpi/icon_star_n.webp create mode 100644 app/src/main/res/drawable-xhdpi/icon_star_s.webp diff --git a/app/src/main/java/com/chwl/app/avroom/activity/RoomTypeSwitchActivity.kt b/app/src/main/java/com/chwl/app/avroom/activity/RoomTypeSwitchActivity.kt index 9ee9dac26..e5cefbb50 100644 --- a/app/src/main/java/com/chwl/app/avroom/activity/RoomTypeSwitchActivity.kt +++ b/app/src/main/java/com/chwl/app/avroom/activity/RoomTypeSwitchActivity.kt @@ -151,22 +151,29 @@ class RoomTypeSwitchActivity : BaseViewBindingActivity() typeArr.filterIndexed { index, micType -> @@ -176,6 +183,7 @@ class RoomTypeSwitchActivity : BaseViewBindingActivity?) @@ -316,6 +324,10 @@ class RoomTypeSwitchActivity : BaseViewBindingActivity binding.bg.changeStrikeColor(if (item.isSelect) "#ff8c03".toColor() else "#1b1b1d".toColor()) binding.bg.changeSoildColor(if (item.isSelect) "#261800".toColor() else "#1b1b1d".toColor()) + binding.tvName.alpha = (if (item.isSelect) 1f else 0.5f) + binding.tvName.setVis(item.dressType == RoomMicDress.RoomDressType.T_Type) + binding.tvName.text = item.name + binding.ivType.setVis(false) binding.ivSkins.setVis(false) binding.ivEffect.setVis(false) diff --git a/app/src/main/java/com/chwl/app/avroom/adapter/UpMicAdapter.java b/app/src/main/java/com/chwl/app/avroom/adapter/UpMicAdapter.java index 1bb3cca9a..c8a6ae06a 100644 --- a/app/src/main/java/com/chwl/app/avroom/adapter/UpMicAdapter.java +++ b/app/src/main/java/com/chwl/app/avroom/adapter/UpMicAdapter.java @@ -76,12 +76,11 @@ public class UpMicAdapter extends BaseQuickAdapter { if (roomQueueInfo.mChatRoomMember == null && (!AvRoomDataManager.get().isLeaveMode() || position != 0) && (!AvRoomDataManager.get().isDatingMode() || AvRoomDataManager.get().isManager(String.valueOf(upUid)) || position != 0)) { - - imageView.setImageResource(position == 0 ? R.drawable.icon_up_mic_ture : R.drawable.icon_up_mic_ture); + imageView.setImageResource((position == 0 && AvRoomDataManager.get().is19Room()) ? R.drawable.icon_room_up_micro_king : R.drawable.icon_up_mic_ture); helper.itemView.setClickable(true); helper.itemView.setOnClickListener(v -> Single.just(position).subscribe(consumer)); } else { - imageView.setImageResource(position == 0 ? R.drawable.icon_up_mic_false : R.drawable.icon_up_mic_false); + imageView.setImageResource(R.drawable.icon_up_mic_false); helper.itemView.setClickable(false); } diff --git a/app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt b/app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt index 2d698e174..f1b58b7e3 100644 --- a/app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt +++ b/app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt @@ -142,8 +142,7 @@ class GiveGoldActivity : BaseViewBindingActivity() { for (i in 0 until 5) { val star = ImageView(context) star.setViewWH(15, 15) - //todo do 待完善: 信誉等级 星星图片 - star.setImageResource( if (i < it.starLevel) R.drawable.c_draw_focused else R.drawable.c_draw_un) + star.setImageResource( if (i < it.starLevel) R.drawable.icon_star_s else R.drawable.icon_star_n) binding.starLayout.addView(star) } } diff --git a/app/src/main/res/drawable-xhdpi/icon_room_up_micro_king.webp b/app/src/main/res/drawable-xhdpi/icon_room_up_micro_king.webp index a5b866af1bac38c58a0d13e02a3d7d4d3e53e8c9..e8c7206c7d6ee80b7e49d8711167581e65c76a2f 100644 GIT binary patch literal 5778 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 Q0#dRU%cet%0`LF;0KYLL;Q#;t literal 2869 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 U02@7#Zxb<3UnnC+Lp1;Z0Hg~=%>V!Z literal 0 HcmV?d00001 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 a9c318294..63e35e591 100644 --- a/app/src/main/res/layout/fragment_chatroom_game_main.xml +++ b/app/src/main/res/layout/fragment_chatroom_game_main.xml @@ -53,7 +53,7 @@ android:id="@+id/btnFold" android:layout_width="@dimen/dp_32" android:src="@drawable/icon_fold_up" - android:layout_marginBottom="@dimen/dp_14" + android:layout_marginBottom="10dp" android:layout_height="@dimen/dp_32"/> + + + app:layout_constraintTop_toTopOf="parent"/> + + \ No newline at end of file diff --git a/app/src/main/res/layout/room_type_switch_activity.xml b/app/src/main/res/layout/room_type_switch_activity.xml index c3d65f6be..7bbde8662 100644 --- a/app/src/main/res/layout/room_type_switch_activity.xml +++ b/app/src/main/res/layout/room_type_switch_activity.xml @@ -53,7 +53,7 @@ app:layout_constraintTop_toTopOf="parent" app:riv_corner_radius="8dp" /> - Unique 房间等级错误 + 9 + 10 + 15 + 20 + 19 + diff --git a/core/src/main/java/com/chwl/core/gift/bean/RoomMicDress.java b/core/src/main/java/com/chwl/core/gift/bean/RoomMicDress.java index 98acd91aa..d6a65a6c9 100644 --- a/core/src/main/java/com/chwl/core/gift/bean/RoomMicDress.java +++ b/core/src/main/java/com/chwl/core/gift/bean/RoomMicDress.java @@ -11,6 +11,7 @@ public class RoomMicDress { public String normalMicLockUrl; public String bossMicUrl; public String bossMicLockUrl; + public String name; public boolean isSelect; public @interface RoomDressType{