From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'
---
app/src/main/res/layout/fragment_me.xml | 103 +++++++++++++++++++++++++++++++--------------------
1 files changed, 63 insertions(+), 40 deletions(-)
diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml
index 83a2a84..6a4024a 100644
--- a/app/src/main/res/layout/fragment_me.xml
+++ b/app/src/main/res/layout/fragment_me.xml
@@ -4,7 +4,7 @@
android:id="@+id/me_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/bj">
+ android:background="@color/text_FF000000">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
@@ -33,7 +33,8 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/me"
- android:textColor="@color/text_E6FFFFFF"
+ android:textColor="@color/text_FFACACAC"
+
android:textSize="@dimen/text_18" />
@@ -57,47 +58,68 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
- <TextView
- android:id="@+id/fragment_me_user_name_tv"
- android:layout_width="wrap_content"
- android:layout_height="22dp"
+ <!--鏄剧ず鐢ㄦ埛鍚嶇О-->
+ <LinearLayout
+ android:id="@+id/user_name_ll"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16"
- android:textColor="@color/text_E6FFFFFF"
- android:textSize="@dimen/text_18"
+ android:layout_marginEnd="@dimen/dp_16"
+ android:gravity="center"
+ android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="@+id/fragment_me_icon_iv"
app:layout_constraintStart_toStartOf="@+id/fragment_me_icon_iv"
- app:layout_constraintTop_toBottomOf="@+id/fragment_me_icon_iv" />
+ app:layout_constraintTop_toBottomOf="@+id/fragment_me_icon_iv">
- <ImageView
- android:id="@+id/fragment_me_user_name_next_iv"
- android:layout_width="16dp"
- android:layout_height="@dimen/dp_16"
- android:layout_marginStart="3dp"
- android:src="@drawable/next"
- app:layout_constraintBottom_toBottomOf="@+id/fragment_me_user_name_tv"
- app:layout_constraintStart_toEndOf="@+id/fragment_me_user_name_tv"
- app:layout_constraintTop_toTopOf="@+id/fragment_me_user_name_tv" />
+ <TextView
+ android:id="@+id/fragment_me_user_name_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="end|center_vertical"
+ android:paddingStart="@dimen/dp_0"
+ android:paddingEnd="@dimen/dp_3"
+ android:textColor="@color/text_FFACACAC"
+ android:textSize="@dimen/text_18" />
- <TextView
- android:id="@+id/fragment_me_user_role_tv"
- android:layout_width="wrap_content"
- android:layout_height="17dp"
- android:layout_marginTop="@dimen/dp_11"
- android:textColor="@color/text_66FFFFFF"
- android:textSize="@dimen/text_14"
+ <ImageView
+ android:id="@+id/fragment_me_user_name_next_iv"
+ android:layout_width="16dp"
+ android:layout_height="@dimen/dp_16"
+ android:src="@drawable/next" />
+ </LinearLayout>
+ <!--鏄剧ず鐢ㄦ埛璐﹀彿-->
+ <LinearLayout
+ android:id="@+id/account_ll"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="4.5dp"
+ android:layout_marginEnd="@dimen/dp_16"
+ android:gravity="center"
+ android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="@+id/fragment_me_icon_iv"
app:layout_constraintStart_toStartOf="@+id/fragment_me_icon_iv"
- app:layout_constraintTop_toBottomOf="@+id/fragment_me_user_name_tv" />
+ app:layout_constraintTop_toBottomOf="@+id/user_name_ll">
- <ImageView
- android:id="@+id/fragment_me_user_role_next_iv"
- android:layout_width="@dimen/dp_16"
- android:layout_height="@dimen/dp_16"
- android:layout_marginStart="3dp"
- android:src="@drawable/next"
- app:layout_constraintBottom_toBottomOf="@+id/fragment_me_user_role_tv"
- app:layout_constraintStart_toEndOf="@+id/fragment_me_user_role_tv"
- app:layout_constraintTop_toTopOf="@+id/fragment_me_user_role_tv" />
+ <TextView
+ android:id="@+id/fragment_me_user_role_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="end|center_vertical"
+ android:paddingStart="@dimen/dp_0"
+ android:paddingEnd="@dimen/dp_3"
+ android:textColor="@color/text_FF5B5B5B"
+ android:textSize="@dimen/text_14" />
+
+ <ImageView
+ android:id="@+id/fragment_me_user_role_next_iv"
+ android:layout_width="@dimen/dp_16"
+ android:layout_height="@dimen/dp_16"
+ android:src="@drawable/next" />
+ </LinearLayout>
+
+
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
@@ -106,19 +128,20 @@
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_16"
- android:background="@drawable/search_bj_ff333738"
+ android:background="@drawable/search_bj_ff1c1c1e"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fragment_me_icon_parent_cl">
<!--璁惧璋冭瘯-->
+ <!--涓昏处鍙锋墠鏄剧ず-->
<include
android:id="@+id/fragment_me_line_device_debug_il"
layout="@layout/fragment_me_line" />
- <!--涓昏处鍙锋墠鏄剧ず-->
- <include
- android:id="@+id/fragment_me_line_user_management_il"
- layout="@layout/fragment_me_line" />
+
+<!-- <include-->
+<!-- android:id="@+id/fragment_me_line_user_management_il"-->
+<!-- layout="@layout/fragment_me_line" />-->
<include
android:id="@+id/fragment_me_line_set_il"
--
Gitblit v1.8.0