From 6e0094e653d317b0efa0aad46ad773feba5a6689 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E7=9A=AE?=
 <14840170+lao-pi123@user.noreply.gitee.com>
Date: Wed, 9 Oct 2024 10:44:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=88=91=E7=9A=84=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2--=E8=B4=B5=E6=97=8F=E4=B8=AD=E5=BF=83=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=A4=E8=A1=8C=E6=97=B6UI=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/src/main/res/layout/view_main_me.xml | 95 ++++++++++++-----------
 1 file changed, 50 insertions(+), 45 deletions(-)

diff --git a/main/src/main/res/layout/view_main_me.xml b/main/src/main/res/layout/view_main_me.xml
index 9d5c05a9f..14afe5d1a 100644
--- a/main/src/main/res/layout/view_main_me.xml
+++ b/main/src/main/res/layout/view_main_me.xml
@@ -512,41 +512,40 @@
                         android:gravity="center"
                         android:orientation="horizontal">
 
-                        <LinearLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent"
-                            android:layout_gravity="end"
-                            android:layout_marginTop="4dp"
-                            android:layout_marginEnd="14dp"
-                            android:clickable="false"
-                            android:focusable="false"
-                            android:focusableInTouchMode="false">
-
-                            <ImageView
-                                android:id="@+id/user_noble_ico"
-                                android:layout_width="48dp"
-                                android:layout_height="45dp"
-                                android:src="@mipmap/icon_vip_gold" />
-                        </LinearLayout>
-
-                        <LinearLayout
+                        <androidx.constraintlayout.widget.ConstraintLayout
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
                             android:layout_weight="1"
                             android:clickable="false"
                             android:focusable="false"
                             android:focusableInTouchMode="false"
-                            android:orientation="vertical"
                             android:paddingLeft="18dp"
                             android:paddingRight="6dp">
 
+
+                            <ImageView
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                android:id="@+id/user_noble_ico"
+                                android:layout_width="48dp"
+                                android:layout_height="45dp"
+                                android:layout_marginTop="4dp"
+                                android:layout_marginEnd="14dp"
+                                android:src="@mipmap/icon_vip_gold" />
+
                             <TextView
                                 android:id="@+id/user_noble_text"
-                                android:layout_width="wrap_content"
+                                android:layout_width="0dp"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="15dp"
                                 android:text=""
+                                android:maxLines="2"
+                                android:ellipsize="end"
                                 android:textColor="#000000"
+                                app:layout_constraintEnd_toStartOf="@id/user_noble_ico"
+                                app:layout_constraintStart_toStartOf="parent"
+                                android:layout_marginEnd="5dp"
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintBottom_toBottomOf="@id/user_noble_ico"
                                 android:textSize="16sp"
                                 android:textStyle="bold" />
 
@@ -554,11 +553,14 @@
                                 android:id="@+id/user_noble_time"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="12dp"
                                 android:text="@string/open_noble_text"
                                 android:textColor="#000000"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                android:layout_marginBottom="2dp"
+                                app:layout_constraintTop_toBottomOf="@id/user_noble_ico"
+                                app:layout_constraintStart_toStartOf="parent"
                                 android:textSize="12sp" />
-                        </LinearLayout>
+                        </androidx.constraintlayout.widget.ConstraintLayout>
 
                         <View
                             android:id="@+id/v_noble"
@@ -591,51 +593,54 @@
                         android:gravity="center"
                         android:orientation="horizontal">
 
-                        <LinearLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent"
-                            android:layout_gravity="end"
-                            android:layout_marginTop="4dp"
-                            android:layout_marginEnd="14dp"
-                            android:clickable="false"
-                            android:focusable="false"
-                            android:focusableInTouchMode="false">
 
-                            <ImageView
-                                android:layout_width="48dp"
-                                android:layout_height="45dp"
-                                android:src="@mipmap/icon_guard_me" />
-                        </LinearLayout>
-
-
-                        <LinearLayout
+                        <androidx.constraintlayout.widget.ConstraintLayout
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
                             android:layout_weight="1"
                             android:clickable="false"
                             android:focusable="false"
                             android:focusableInTouchMode="false"
-                            android:orientation="vertical"
                             android:paddingLeft="18dp"
                             android:paddingRight="6dp">
 
+
+                            <ImageView
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                android:id="@+id/user_noble_ico_2"
+                                android:layout_width="48dp"
+                                android:layout_height="45dp"
+                                android:layout_marginTop="4dp"
+                                android:layout_marginEnd="14dp"
+                                android:src="@mipmap/icon_guard_me" />
+
                             <TextView
-                                android:layout_width="wrap_content"
+                                android:id="@+id/user_noble_text_2"
+                                android:layout_width="0dp"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="15dp"
                                 android:text="@string/live_guard"
                                 android:textColor="#000000"
+                                app:layout_constraintEnd_toStartOf="@id/user_noble_ico_2"
+                                app:layout_constraintStart_toStartOf="parent"
+                                android:layout_marginEnd="5dp"
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintBottom_toBottomOf="@id/user_noble_ico_2"
                                 android:textSize="16sp"
                                 android:textStyle="bold" />
 
                             <TextView
+                                android:id="@+id/user_noble_time_2"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="12dp"
                                 android:text="@string/guard_for_your_beloved_one"
                                 android:textColor="#000000"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                android:layout_marginBottom="2dp"
+                                app:layout_constraintTop_toBottomOf="@id/user_noble_ico_2"
+                                app:layout_constraintStart_toStartOf="parent"
                                 android:textSize="12sp" />
-                        </LinearLayout>
+                        </androidx.constraintlayout.widget.ConstraintLayout>
                     </FrameLayout>
                 </LinearLayout>