From 3762a73b57072439b626a2ede9082e20428ef9d2 Mon Sep 17 00:00:00 2001
From: wushaocheng <15876365887@163.com>
Date: Tue, 23 May 2023 11:23:38 +0800
Subject: [PATCH] =?UTF-8?q?[Modify]=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nim_recent_contact_list_item_new.xml      | 49 +++++++------
 .../nim_recent_contact_team_list_item.xml     | 72 +++++++++----------
 2 files changed, 59 insertions(+), 62 deletions(-)

diff --git a/app/src/main/res/layout/nim_recent_contact_list_item_new.xml b/app/src/main/res/layout/nim_recent_contact_list_item_new.xml
index fdc4f2fc0..98744f9cb 100644
--- a/app/src/main/res/layout/nim_recent_contact_list_item_new.xml
+++ b/app/src/main/res/layout/nim_recent_contact_list_item_new.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="71dp"
+    android:layout_height="70dp"
     android:clickable="true"
     android:focusable="true"
     android:orientation="vertical"
@@ -10,7 +10,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="71dp"
+        android:layout_height="70dp"
         android:orientation="horizontal">
 
         <RelativeLayout
@@ -18,19 +18,19 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="5dp">
+            android:layout_marginStart="@dimen/dp_8">
 
             <com.netease.nim.uikit.common.ui.imageview.HeadImageView
                 android:id="@+id/img_head"
-                android:layout_width="55dp"
-                android:layout_height="55dp"
+                android:layout_width="54dp"
+                android:layout_height="54dp"
                 android:layout_centerInParent="true"
                 tools:src="@drawable/default_avatar" />
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/noble_head_wear"
-                android:layout_width="75dp"
-                android:layout_height="75dp"
+                android:layout_width="70dp"
+                android:layout_height="70dp"
                 android:layout_centerInParent="true"
                 tools:src="@mipmap/ic_user_avatar_level_king" />
 
@@ -39,8 +39,7 @@
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="16dp"
             android:layout_weight="1"
             android:orientation="vertical">
 
@@ -71,7 +70,7 @@
                     android:singleLine="true"
                     android:text=""
                     android:textColor="@color/text_title_color"
-                    android:textSize="15dp"
+                    android:textSize="@dimen/sp_14"
                     tools:ignore="SpUsage"
                     tools:text="@string/layout_nim_recent_contact_list_item_new_01" />
 
@@ -118,7 +117,7 @@
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
+                android:layout_marginTop="@dimen/dp_2"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
@@ -130,8 +129,8 @@
                     android:gravity="center_vertical"
                     android:lines="1"
                     android:text=""
-                    android:textColor="@color/text_normal_c6c6e9"
-                    android:textSize="12dp"
+                    android:textColor="@color/color_B3B3C3"
+                    android:textSize="@dimen/sp_12"
                     tools:ignore="SpUsage"
                     tools:text="@string/layout_nim_recent_contact_list_item_new_02" />
 
@@ -147,7 +146,7 @@
 
                 <TextView
                     android:id="@+id/tv_message"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:autoLink="none"
@@ -156,8 +155,8 @@
                     android:lines="1"
                     android:scrollHorizontally="true"
                     android:text=""
-                    android:textColor="@color/text_normal_c6c6e9"
-                    android:textSize="12dp"
+                    android:textColor="@color/color_B3B3C3"
+                    android:textSize="@dimen/sp_12"
                     tools:ignore="SpUsage"
                     tools:text="@string/layout_nim_recent_contact_list_item_new_03" />
 
@@ -168,7 +167,7 @@
         <FrameLayout
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="16dp"
             android:layout_marginEnd="15dp"
             android:gravity="end"
             android:orientation="vertical">
@@ -177,7 +176,7 @@
                 android:id="@+id/unread_number_tip"
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_18"
-                android:layout_gravity="right"
+                android:layout_gravity="end"
                 android:singleLine="true"
                 android:visibility="gone"
                 tools:text="123"
@@ -185,8 +184,8 @@
 
             <ImageView
                 android:id="@+id/unread_number_explosion"
-                android:layout_width="35dip"
-                android:layout_height="35dip"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
                 android:gravity="center"
                 android:visibility="gone"
                 tools:ignore="ContentDescription"
@@ -196,11 +195,11 @@
                 android:id="@+id/tv_date_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical|right"
-                android:layout_marginTop="6dp"
-                android:textColor="@color/text_secondary_4f516a"
-                android:textSize="11dp"
-                tools:text="just now" />
+                android:layout_gravity="center_vertical|end"
+                android:layout_marginTop="4dp"
+                android:textColor="@color/color_B3B3C3"
+                android:textSize="@dimen/sp_11"
+                tools:text="20:00" />
 
         </FrameLayout>
 
diff --git a/app/src/module_mini_world/res/layout/nim_recent_contact_team_list_item.xml b/app/src/module_mini_world/res/layout/nim_recent_contact_team_list_item.xml
index eecfeded8..4e8884934 100644
--- a/app/src/module_mini_world/res/layout/nim_recent_contact_team_list_item.xml
+++ b/app/src/module_mini_world/res/layout/nim_recent_contact_team_list_item.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
-    android:layout_height="71dp"
+    android:layout_height="70dp"
     android:clickable="true"
     android:focusable="true">
 
@@ -11,34 +11,34 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_marginStart="@dimen/dp_5">
+        android:layout_marginStart="@dimen/dp_8">
 
         <com.netease.nim.uikit.common.ui.imageview.HeadImageView
             android:id="@+id/img_head"
-            android:layout_width="55dp"
-            android:layout_height="55dp"
+            android:layout_width="54dp"
+            android:layout_height="54dp"
             android:layout_centerInParent="true"
             tools:src="@drawable/default_avatar" />
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/noble_head_wear"
-            android:layout_width="75dp"
-            android:layout_height="75dp"
+            android:layout_width="70dp"
+            android:layout_height="70dp"
             android:layout_centerInParent="true"
             tools:src="@mipmap/ic_user_avatar_level_king" />
 
         <FrameLayout
-            android:layout_centerInParent="true"
             android:layout_width="55dp"
-            android:layout_height="55dp">
+            android:layout_height="55dp"
+            android:layout_centerInParent="true">
 
             <ImageView
                 android:id="@+id/iv_mini_world_img"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
+                android:layout_gravity="bottom|end"
                 android:src="@drawable/ic_mini_world_team"
-                android:visibility="gone"/>
+                android:visibility="gone" />
 
         </FrameLayout>
     </RelativeLayout>
@@ -48,17 +48,17 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_centerVertical="true"
-        android:layout_marginBottom="@dimen/dp_4"
-        android:layout_marginTop="@dimen/dp_4" />
+        android:layout_marginTop="@dimen/dp_4"
+        android:layout_marginBottom="@dimen/dp_4" />
 
     <LinearLayout
         android:id="@+id/content_layout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/center_view"
-        android:layout_toEndOf="@id/rl_user_avatar"
-        android:layout_marginStart="10dp"
+        android:layout_marginTop="@dimen/dp_2"
+        android:layout_below="@id/tv_nickname"
         android:layout_marginEnd="50dp"
+        android:layout_toEndOf="@id/rl_user_avatar"
         android:orientation="horizontal">
 
         <TextView
@@ -69,8 +69,8 @@
             android:gravity="center_vertical"
             android:lines="1"
             android:text=""
-            android:textColor="@color/color_999999"
-            android:textSize="12dp"
+            android:textColor="@color/color_B3B3C3"
+            android:textSize="@dimen/sp_12"
             tools:ignore="SpUsage"
             tools:text="@string/layout_nim_recent_contact_team_list_item_01" />
 
@@ -95,26 +95,25 @@
             android:scrollHorizontally="true"
             android:text=""
             android:textColor="@color/color_B3B3B3"
-            android:textSize="13dp"
+            android:textSize="@dimen/sp_14"
             tools:ignore="SpUsage" />
+
     </LinearLayout>
 
     <TextView
         android:id="@+id/tv_nickname"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_above="@+id/center_view"
-        android:layout_marginStart="10dp"
+        android:layout_marginTop="@dimen/dp_16"
         android:layout_toStartOf="@+id/tv_date_time"
         android:layout_toEndOf="@id/rl_user_avatar"
         android:ellipsize="end"
-        android:includeFontPadding="false"
         android:maxEms="12"
         android:maxLines="1"
         android:singleLine="true"
         android:text=""
         android:textColor="@color/color_black_333333"
-        android:textSize="15dp"
+        android:textSize="@dimen/sp_14"
         tools:ignore="SpUsage"
         tools:text="@string/layout_nim_recent_contact_team_list_item_02" />
 
@@ -122,41 +121,40 @@
         android:id="@+id/unread_number_tip"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
         android:layout_alignParentTop="true"
-        android:layout_marginEnd="15dp"
-        android:layout_marginTop="16dip"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/dp_20"
+        android:layout_marginEnd="@dimen/dp_15"
         android:gravity="center"
         android:singleLine="true"
         android:textColor="@android:color/white"
-        android:textSize="12sp"
-        tools:visibility="visible"
+        android:textSize="@dimen/sp_12"
         android:visibility="gone"
         tools:text="123"
-        />
+        tools:visibility="visible" />
 
     <TextView
         android:id="@+id/tv_date_time"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
         android:layout_below="@id/tv_nickname"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="2dp"
         android:layout_marginEnd="15dp"
-        android:layout_marginTop="10dp"
         android:textColor="@color/color_B3B3C3"
-        tools:text="@string/layout_nim_recent_contact_team_list_item_03"
-        android:textSize="@dimen/sp_12" />
+        android:textSize="@dimen/sp_12"
+        tools:text="@string/layout_nim_recent_contact_team_list_item_03" />
 
 
     <ImageView
-        android:layout_toEndOf="@+id/unread_number_tip"
         android:id="@+id/iv_mute_notification"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_marginEnd="15dp"
-        android:layout_marginTop="10dp"
         android:layout_below="@id/tv_nickname"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="10dp"
+        android:layout_marginEnd="15dp"
+        android:layout_toEndOf="@+id/unread_number_tip"
         android:src="@drawable/ic_mute_notification"
         android:visibility="gone"
         tools:visibility="visible" />
@@ -165,8 +163,8 @@
         android:id="@+id/unread_number_explosion"
         android:layout_width="35dip"
         android:layout_height="35dip"
-        android:layout_alignParentEnd="true"
         android:layout_below="@id/tv_nickname"
+        android:layout_alignParentEnd="true"
         android:layout_marginEnd="15dp"
         android:gravity="center"
         android:visibility="gone" />