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

fix：修复UI反馈问题（房间背景条目-使用中文案未上下局中、主麦没人时礼物值未相对局中问题、调整锁麦ICON）

Browse Source
This commit is contained in:
max
2024-05-22 17:54:21 +08:00
parent 37eaf9d08d
commit ded1072961
8 changed files with 249 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/chwl/app/avroom/adapter/BaseMicroViewAdapter.java
View File

@@ -564,6 +564,7 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
protected void setDefalutText(int index) { protected void setDefalutText(int index) {
//重新覆盖掉用户名的逻辑 //重新覆盖掉用户名的逻辑
tvNick.setText(""); tvNick.setText("");
tvNick.setVisibility(View.GONE);
tvNick.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); tvNick.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
ivTag.setVisibility(View.GONE); ivTag.setVisibility(View.GONE);
} }
@@ -571,6 +572,7 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
@Override @Override
protected void setSelectText(int index, String nick, int gender) { protected void setSelectText(int index, String nick, int gender) {
super.setSelectText(index, nick, gender); super.setSelectText(index, nick, gender);
tvNick.setVisibility(View.VISIBLE);
if (UserModel.get().getCacheLoginUserInfo() != null && if (UserModel.get().getCacheLoginUserInfo() != null &&
UserModel.get().getCacheLoginUserInfo().getUserInfoSkillVo() != null) { UserModel.get().getCacheLoginUserInfo().getUserInfoSkillVo() != null) {
if (AvRoomDataManager.get().isRoomOwner() && !TextUtils.isEmpty(UserModel.get().getCacheLoginUserInfo().getUserInfoSkillVo().getSkillTag())) { if (AvRoomDataManager.get().isRoomOwner() && !TextUtils.isEmpty(UserModel.get().getCacheLoginUserInfo().getUserInfoSkillVo().getSkillTag())) {

1
app/src/main/java/com/chwl/app/avroom/adapter/DatingMicroViewAdapter.kt
View File

@@ -146,6 +146,7 @@ class DatingMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(context)
if (info.mChatRoomMember == null) { if (info.mChatRoomMember == null) {
tvNick.alpha = 1f tvNick.alpha = 1f
tvNick.text = "主持人" tvNick.text = "主持人"
tvNick.isVisible = true
ivVipWear.isVisible = false ivVipWear.isVisible = false
} else { } else {
if (info.mChatRoomMember.isVipMic) { if (info.mChatRoomMember.isVipMic) {

BIN
app/src/main/res/drawable-xxhdpi/icon_room_lock_micro.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

BIN
app/src/main/res/drawable-xxhdpi/icon_room_lock_micro_boss.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

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

@@ -130,74 +130,154 @@
tools:text="@string/layout_item_boss_micro_01" tools:text="@string/layout_item_boss_micro_01"
tools:visibility="visible" /> tools:visibility="visible" />
<ImageView <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/iv_tag" android:id="@+id/layout_nick"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_5"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/nick"
app:layout_constraintEnd_toStartOf="@id/nick"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="@id/micro_layout"
app:layout_constraintTop_toTopOf="@id/nick"
tools:background="@color/red_font"
tools:layout_width="15dp"
tools:visibility="visible" />
<TextView
android:id="@+id/nick"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5" android:layout_marginTop="@dimen/dp_5"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxWidth="52dp"
android:maxLines="1"
android:singleLine="true"
android:text=""
android:textColor="@color/white"
android:textSize="@dimen/sp_10"
app:layout_constraintEnd_toStartOf="@id/ll_charm_click"
app:layout_constraintStart_toEndOf="@+id/iv_tag"
app:layout_constraintTop_toBottomOf="@id/micro_layout"
tools:text="Name" />
<LinearLayout
android:id="@+id/ll_charm_click"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_16"
android:layout_gravity="center_horizontal"
android:layout_marginStart="@dimen/dp_4"
android:background="@drawable/shape_bg_of_mic_charm"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="@dimen/dp_4"
android:paddingEnd="@dimen/dp_4"
app:layout_constraintBottom_toBottomOf="@id/nick"
app:layout_constraintEnd_toEndOf="@id/micro_layout" app:layout_constraintEnd_toEndOf="@id/micro_layout"
app:layout_constraintStart_toEndOf="@id/nick" app:layout_constraintStart_toStartOf="@id/micro_layout"
app:layout_constraintTop_toTopOf="@+id/nick"> app:layout_constraintTop_toBottomOf="@id/micro_layout">
<ImageView <ImageView
android:layout_width="@dimen/dp_11" android:id="@+id/iv_tag"
android:layout_height="@dimen/dp_11" android:layout_width="wrap_content"
android:layout_gravity="center_vertical" android:layout_height="@dimen/dp_15"
android:scaleType="center" android:layout_marginEnd="@dimen/dp_5"
android:src="@drawable/icon_gift_value" /> android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/nick"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:background="@color/red_font"
tools:layout_width="15dp"
tools:visibility="visible" />
<TextView <TextView
android:id="@+id/tv_charm_value" android:id="@+id/nick"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_marginEnd="@dimen/dp_4"
android:layout_marginStart="@dimen/dp_3" android:ellipsize="end"
android:gravity="center" android:gravity="center_vertical"
android:text="0" android:maxWidth="52dp"
android:textColor="@color/color_white" android:maxLines="1"
android:singleLine="true"
android:text=""
android:textColor="@color/white"
android:textSize="@dimen/sp_10" android:textSize="@dimen/sp_10"
tools:text="10000" /> app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/ll_charm_click"
app:layout_constraintStart_toEndOf="@id/iv_tag"
app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginEnd="0dp"
tools:text="Name" />
</LinearLayout> <LinearLayout
android:id="@+id/ll_charm_click"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_16"
android:layout_gravity="center_horizontal"
android:background="@drawable/shape_bg_of_mic_charm"
android:orientation="horizontal"
android:paddingStart="@dimen/dp_4"
android:paddingEnd="@dimen/dp_4"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/nick"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:layout_width="@dimen/dp_11"
android:layout_height="@dimen/dp_11"
android:layout_gravity="center_vertical"
android:scaleType="center"
android:src="@drawable/icon_gift_value" />
<TextView
android:id="@+id/tv_charm_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/dp_3"
android:gravity="center"
android:text="0"
android:textColor="@color/color_white"
android:textSize="@dimen/sp_10"
tools:text="10000" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<!-- <LinearLayout-->
<!-- android:id="@+id/layout_nick"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="@dimen/dp_5"-->
<!-- android:orientation="horizontal"-->
<!-- app:layout_constraintEnd_toEndOf="@id/micro_layout"-->
<!-- app:layout_constraintStart_toStartOf="@id/micro_layout"-->
<!-- app:layout_constraintTop_toBottomOf="@id/micro_layout">-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_tag"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="@dimen/dp_15"-->
<!-- android:layout_marginEnd="@dimen/dp_5"-->
<!-- android:visibility="gone"-->
<!-- tools:background="@color/red_font"-->
<!-- tools:layout_width="15dp"-->
<!-- tools:visibility="visible" />-->
<!-- <TextView-->
<!-- android:id="@+id/nick"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginEnd="@dimen/dp_4"-->
<!-- android:ellipsize="end"-->
<!-- android:gravity="center_vertical"-->
<!-- android:maxWidth="52dp"-->
<!-- android:maxLines="1"-->
<!-- android:singleLine="true"-->
<!-- android:text=""-->
<!-- android:textColor="@color/white"-->
<!-- android:textSize="@dimen/sp_10"-->
<!-- tools:text="Name" />-->
<!-- <LinearLayout-->
<!-- android:id="@+id/ll_charm_click"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="@dimen/dp_16"-->
<!-- android:layout_gravity="center_horizontal"-->
<!-- android:background="@drawable/shape_bg_of_mic_charm"-->
<!-- android:orientation="horizontal"-->
<!-- android:paddingStart="@dimen/dp_4"-->
<!-- android:paddingEnd="@dimen/dp_4">-->
<!-- <ImageView-->
<!-- android:layout_width="@dimen/dp_11"-->
<!-- android:layout_height="@dimen/dp_11"-->
<!-- android:layout_gravity="center_vertical"-->
<!-- android:scaleType="center"-->
<!-- android:src="@drawable/icon_gift_value" />-->
<!-- <TextView-->
<!-- android:id="@+id/tv_charm_value"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_gravity="center_vertical"-->
<!-- android:layout_marginStart="@dimen/dp_3"-->
<!-- android:gravity="center"-->
<!-- android:text="0"-->
<!-- android:textColor="@color/color_white"-->
<!-- android:textSize="@dimen/sp_10"-->
<!-- tools:text="10000" />-->
<!-- </LinearLayout>-->
<!-- </LinearLayout>-->
<LinearLayout <LinearLayout
android:id="@+id/fr_title" android:id="@+id/fr_title"
@@ -207,7 +287,7 @@
android:layout_toEndOf="@+id/micro_layout" android:layout_toEndOf="@+id/micro_layout"
app:layout_constraintEnd_toEndOf="@id/micro_layout" app:layout_constraintEnd_toEndOf="@id/micro_layout"
app:layout_constraintStart_toStartOf="@id/micro_layout" app:layout_constraintStart_toStartOf="@id/micro_layout"
app:layout_constraintTop_toBottomOf="@id/nick"> app:layout_constraintTop_toBottomOf="@id/layout_nick">
<TextView <TextView
android:id="@+id/tv_room_desc" android:id="@+id/tv_room_desc"

105
app/src/main/res/layout/item_micro_dating_boss.xml
View File

@@ -219,7 +219,7 @@
<!-- app:layout_constraintTop_toTopOf="parent"--> <!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- tools:textColor="#000" />--> <!-- tools:textColor="#000" />-->
<LinearLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/rl_nick" android:id="@+id/rl_nick"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -228,66 +228,67 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/micro_layout"> app:layout_constraintTop_toBottomOf="@id/micro_layout">
<LinearLayout <ImageView
android:id="@+id/ll_nick" android:id="@+id/iv_tag"
android:layout_width="wrap_content"
android:layout_height="15dp"
android:layout_marginEnd="5dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/nick"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/nick"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical"> android:layout_marginEnd="4dp"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxWidth="120dp"
android:maxLines="1"
android:singleLine="true"
android:text=""
android:textColor="@color/white"
android:textSize="13sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/ll_charm_click"
app:layout_constraintStart_toEndOf="@id/iv_tag"
app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginEnd="0dp"
tools:text="@string/layout_item_micro_dating_boss_03" />
<LinearLayout
android:id="@+id/ll_charm_click"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:background="@drawable/shape_bg_of_mic_charm"
android:paddingStart="4dp"
android:paddingEnd="4dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/nick"
app:layout_constraintTop_toTopOf="parent">
<ImageView <ImageView
android:id="@+id/iv_tag" android:layout_width="11dp"
android:layout_width="wrap_content" android:layout_height="11dp"
android:layout_height="15dp" android:layout_gravity="center_vertical"
android:layout_marginEnd="5dp" /> android:scaleType="center"
android:src="@drawable/icon_gift_value" />
<TextView <TextView
android:id="@+id/nick" android:id="@+id/tv_charm_value"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end" android:layout_gravity="center_vertical"
android:gravity="center_vertical" android:layout_marginStart="3dp"
android:maxWidth="120dp" android:gravity="center"
android:maxLines="1" android:text="0"
android:singleLine="true" android:textColor="@color/color_white"
android:text="" android:textSize="@dimen/sp_10" />
android:textColor="@color/white"
android:textSize="13sp"
tools:text="@string/layout_item_micro_dating_boss_03" />
<LinearLayout
android:id="@+id/ll_charm_click"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:layout_below="@id/ll_nick"
android:layout_centerHorizontal="true"
android:layout_marginStart="4dp"
android:background="@drawable/shape_bg_of_mic_charm"
android:paddingStart="4dp"
android:paddingEnd="4dp">
<ImageView
android:layout_width="11dp"
android:layout_height="11dp"
android:layout_gravity="center_vertical"
android:scaleType="center"
android:src="@drawable/icon_gift_value" />
<TextView
android:id="@+id/tv_charm_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="3dp"
android:gravity="center"
android:text="0"
android:textColor="@color/color_white"
android:textSize="@dimen/sp_10" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/desc_layout" android:id="@+id/desc_layout"

103
app/src/main/res/layout/item_micro_single_anchor_boss.xml
View File

@@ -165,7 +165,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
<LinearLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/rl_nick" android:id="@+id/rl_nick"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -174,65 +174,70 @@
app:layout_constraintTop_toBottomOf="@id/line_nick_top" app:layout_constraintTop_toBottomOf="@id/line_nick_top"
app:layout_constraintVertical_bias="0.3"> app:layout_constraintVertical_bias="0.3">
<LinearLayout <ImageView
android:id="@+id/ll_nick" android:id="@+id/iv_tag"
android:layout_width="wrap_content"
android:layout_height="15dp"
android:layout_marginEnd="5dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/nick"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/nick"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical"> android:layout_marginEnd="4dp"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxWidth="120dp"
android:maxLines="1"
android:singleLine="true"
android:text=""
android:textColor="@color/white"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/ll_charm_click"
app:layout_constraintStart_toEndOf="@id/iv_tag"
app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginEnd="0dp"
tools:text="@string/layout_item_micro_single_anchor_boss_02" />
<LinearLayout
android:id="@+id/ll_charm_click"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:background="@drawable/shape_bg_of_mic_charm"
android:paddingStart="4dp"
android:paddingEnd="4dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/nick"
app:layout_constraintTop_toTopOf="parent">
<ImageView <ImageView
android:id="@+id/iv_tag" android:layout_width="11dp"
android:layout_width="wrap_content" android:layout_height="11dp"
android:layout_height="15dp" android:layout_gravity="center_vertical"
android:layout_marginEnd="5dp" /> android:scaleType="center"
android:src="@drawable/icon_gift_value" />
<TextView <TextView
android:id="@+id/nick" android:id="@+id/tv_charm_value"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end" android:layout_gravity="center_vertical"
android:gravity="center_vertical" android:layout_marginStart="3dp"
android:maxWidth="120dp" android:gravity="center"
android:maxLines="1" android:text="0"
android:singleLine="true" android:textColor="@color/color_white"
android:text="" android:textSize="@dimen/sp_10" />
android:textColor="@color/white"
android:textSize="14sp"
android:textStyle="bold"
tools:text="@string/layout_item_micro_single_anchor_boss_02" />
<LinearLayout
android:id="@+id/ll_charm_click"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:layout_marginStart="4dp"
android:background="@drawable/shape_bg_of_mic_charm"
android:paddingStart="4dp"
android:paddingEnd="4dp">
<ImageView
android:layout_width="11dp"
android:layout_height="11dp"
android:layout_gravity="center_vertical"
android:scaleType="center"
android:src="@drawable/icon_gift_value" />
<TextView
android:id="@+id/tv_charm_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="3dp"
android:gravity="center"
android:text="0"
android:textColor="@color/color_white"
android:textSize="@dimen/sp_10" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout <LinearLayout
android:id="@+id/desc_layout" android:id="@+id/desc_layout"

5
app/src/main/res/layout/room_bg_setting_item.xml
View File

@@ -3,9 +3,9 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_7" android:layout_marginHorizontal="@dimen/dp_7"
android:layout_marginVertical="@dimen/dp_8" android:layout_marginVertical="@dimen/dp_8">
android:layout_height="wrap_content">
<com.google.android.material.imageview.ShapeableImageView <com.google.android.material.imageview.ShapeableImageView
android:id="@+id/iv_image" android:id="@+id/iv_image"
@@ -22,6 +22,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/shape_b2afff_5dp" android:background="@drawable/shape_b2afff_5dp"
android:includeFontPadding="false"
android:paddingHorizontal="@dimen/dp_6" android:paddingHorizontal="@dimen/dp_6"
android:paddingVertical="@dimen/dp_3" android:paddingVertical="@dimen/dp_3"
android:text="@string/layout_item_live_tag_01" android:text="@string/layout_item_live_tag_01"