From 129af8f574acc5483d890e228d06924db5a5b2aa Mon Sep 17 00:00:00 2001
From: Max <mxruan@163.com>
Date: Wed, 29 Nov 2023 12:41:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=BA=A6=E4=BD=8D-PK?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E7=9A=84UI=E5=B1=95=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/item_boss_micro.xml | 20 ++++++-------
 app/src/main/res/layout/list_item_micro.xml | 32 ++++++++++-----------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/app/src/main/res/layout/item_boss_micro.xml b/app/src/main/res/layout/item_boss_micro.xml
index bdb2a1439..89bbf6c55 100644
--- a/app/src/main/res/layout/item_boss_micro.xml
+++ b/app/src/main/res/layout/item_boss_micro.xml
@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     android:clipChildren="false"
     android:clipToPadding="false"
-    android:paddingTop="11dp"
+    android:paddingTop="@dimen/dp_11"
     tools:background="@color/blue">
 
     <FrameLayout
@@ -82,8 +82,8 @@
 
             <ImageView
                 android:id="@+id/mute_image"
-                android:layout_width="15dp"
-                android:layout_height="15dp"
+                android:layout_width="@dimen/dp_15"
+                android:layout_height="@dimen/dp_15"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentBottom="true"
                 android:layout_gravity="center"
@@ -93,8 +93,8 @@
 
             <ImageView
                 android:id="@+id/iv_kick_guard"
-                android:layout_width="18dp"
-                android:layout_height="18dp"
+                android:layout_width="@dimen/dp_18"
+                android:layout_height="@dimen/dp_18"
                 android:layout_alignParentStart="true"
                 android:layout_alignParentBottom="true"
                 android:layout_gravity="center"
@@ -115,14 +115,14 @@
 
     <TextView
         android:id="@+id/tv_pk_mark"
-        android:layout_width="34dp"
-        android:layout_height="15dp"
+        android:layout_width="@dimen/dp_34"
+        android:layout_height="@dimen/dp_15"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="60dp"
+        android:layout_marginTop="@dimen/dp_50"
         android:background="@drawable/shape_pk_mic_queue_mark_red"
         android:gravity="center"
         android:textColor="@color/color_FFFFFF"
-        android:textSize="9sp"
+        android:textSize="@dimen/dp_9"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -133,7 +133,7 @@
     <ImageView
         android:id="@+id/iv_tag"
         android:layout_width="wrap_content"
-        android:layout_height="15dp"
+        android:layout_height="@dimen/dp_15"
         android:layout_marginEnd="@dimen/dp_5"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@id/nick"
diff --git a/app/src/main/res/layout/list_item_micro.xml b/app/src/main/res/layout/list_item_micro.xml
index 6cbdc8d05..4bd475074 100644
--- a/app/src/main/res/layout/list_item_micro.xml
+++ b/app/src/main/res/layout/list_item_micro.xml
@@ -6,7 +6,7 @@
     android:clipChildren="false"
     android:clipToPadding="false"
     android:orientation="vertical"
-    android:paddingTop="10dp"
+    android:paddingTop="@dimen/dp_10"
     tools:background="@color/blue">
 
     <FrameLayout
@@ -60,7 +60,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:gravity="center"
-            android:textSize="9dp" />
+            android:textSize="@dimen/dp_9" />
 
         <RelativeLayout
             android:layout_width="@dimen/dp_50"
@@ -69,8 +69,8 @@
 
             <ImageView
                 android:id="@+id/mute_image"
-                android:layout_width="15dp"
-                android:layout_height="15dp"
+                android:layout_width="@dimen/dp_15"
+                android:layout_height="@dimen/dp_15"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentBottom="true"
                 android:scaleType="fitCenter"
@@ -80,8 +80,8 @@
 
             <ImageView
                 android:id="@+id/iv_kick_guard"
-                android:layout_width="18dp"
-                android:layout_height="18dp"
+                android:layout_width="@dimen/dp_18"
+                android:layout_height="@dimen/dp_18"
                 android:layout_alignParentStart="true"
                 android:layout_alignParentBottom="true"
                 android:layout_gravity="center"
@@ -101,14 +101,14 @@
 
     <TextView
         android:id="@+id/tv_pk_mark"
-        android:layout_width="34dp"
-        android:layout_height="15dp"
+        android:layout_width="@dimen/dp_34"
+        android:layout_height="@dimen/dp_15"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="58dp"
+        android:layout_marginTop="@dimen/dp_50"
         android:background="@drawable/shape_pk_mic_queue_mark_red"
         android:gravity="center"
         android:textColor="@color/color_FFFFFF"
-        android:textSize="9dp"
+        android:textSize="@dimen/dp_9"
         android:visibility="gone"
         tools:text="@string/layout_list_item_micro_01"
         tools:visibility="visible" />
@@ -117,7 +117,7 @@
     <LinearLayout
         android:id="@+id/ll_nick"
         android:layout_width="wrap_content"
-        android:layout_height="14dp"
+        android:layout_height="@dimen/dp_14"
         android:layout_below="@id/micro_layout"
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="@dimen/dp_3"
@@ -138,15 +138,15 @@
         <TextView
             android:id="@+id/nick"
             android:layout_width="wrap_content"
-            android:layout_height="14dp"
+            android:layout_height="@dimen/dp_14"
             android:ellipsize="end"
             android:gravity="center"
             android:maxLines="1"
-            android:paddingStart="2dp"
-            android:paddingEnd="2dp"
+            android:paddingStart="@dimen/dp_2"
+            android:paddingEnd="@dimen/dp_2"
             android:singleLine="true"
             android:textColor="@color/white"
-            android:textSize="10sp"
+            android:textSize="@dimen/dp_10"
             tools:text="@string/layout_list_item_micro_02"
             tools:textColor="@color/white" />
 
@@ -158,7 +158,7 @@
         android:layout_height="@dimen/dp_14"
         android:layout_below="@id/ll_nick"
         android:layout_centerHorizontal="true"
-        android:layout_marginStart="4dp"
+        android:layout_marginStart="@dimen/dp_4"
         android:layout_marginTop="@dimen/dp_3"
         android:background="@drawable/shape_bg_of_mic_charm"
         android:paddingStart="@dimen/dp_3"