From 90d5f028ccdaaaf64286f9d632cb335a4d0544b9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 一月 2025 09:40:52 +0800
Subject: [PATCH] Merge branch '1.5.1'
---
app/src/main/res/layout/fragment_me.xml | 242 +++++++++++++++++++++++++++--------------------
1 files changed, 139 insertions(+), 103 deletions(-)
diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml
index e5b2113..5c9fd49 100644
--- a/app/src/main/res/layout/fragment_me.xml
+++ b/app/src/main/res/layout/fragment_me.xml
@@ -4,118 +4,154 @@
android:id="@+id/me_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/bj">
- <!--澶撮儴鏍囩-->
- <RelativeLayout
- android:id="@+id/title_cl"
+ android:background="@color/text_FF000000">
+
+ <androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_44"
- android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_38"
- android:layout_marginEnd="@dimen/dp_16"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent">
+ android:layout_height="match_parent"
+ android:fillViewport="true"
+ android:overScrollMode="never">
- <TextView
- android:id="@+id/me_title_tv"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerInParent="true"
- android:text="@string/me"
- android:textColor="@color/text_030D1C"
- android:textSize="@dimen/text_18" />
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <!--澶撮儴鏍囩-->
+ <RelativeLayout
+ android:id="@+id/title_cl"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_44"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_38"
+ android:layout_marginEnd="@dimen/dp_16"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <TextView
+ android:id="@+id/me_title_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ android:text="@string/me"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_18" />
- </RelativeLayout>
+ </RelativeLayout>
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/fragment_me_icon_parent_cl"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/dp_13"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/title_cl">
+
+ <ImageView
+ android:id="@+id/fragment_me_icon_iv"
+ android:layout_width="73dp"
+ android:layout_height="73dp"
+ android:background="@drawable/default_image"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <!--鏄剧ず鐢ㄦ埛鍚嶇О-->
+ <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: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">
+
+ <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_E6FFFFFF"
+ android:textSize="@dimen/text_18" />
+
+ <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/user_name_ll">
+
+ <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_66FFFFFF"
+ 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
- android:id="@+id/fragment_me_icon_parent_cl"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/dp_13"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/title_cl">
+ </androidx.constraintlayout.widget.ConstraintLayout>
- <ImageView
- android:id="@+id/fragment_me_icon_iv"
- android:layout_width="73dp"
- android:layout_height="73dp"
- android:background="@drawable/default_image"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_20"
+ android:layout_marginEnd="@dimen/dp_16"
+ 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" />
- <TextView
- android:id="@+id/fragment_me_user_name_tv"
- android:layout_width="wrap_content"
- android:layout_height="22dp"
- android:layout_marginTop="@dimen/dp_16"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_18"
- 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" />
+ <include
+ android:id="@+id/fragment_me_line_user_management_il"
+ layout="@layout/fragment_me_line" />
- <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_role_tv"
- android:layout_width="wrap_content"
- android:layout_height="17dp"
- android:layout_marginTop="@dimen/dp_11"
- android:textColor="@color/text_66000000"
- android:textSize="@dimen/text_14"
- 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" />
-
- <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" />
- </androidx.constraintlayout.widget.ConstraintLayout>
-
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_25"
- android:layout_marginEnd="@dimen/dp_16"
- android:background="@drawable/bj_13fffffff"
- 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_user_management_il"
- layout="@layout/fragment_me_line" />
-
- <include
- android:id="@+id/fragment_me_line_set_il"
- layout="@layout/fragment_me_line" />
- <!--鍏充簬-->
- <include
- android:id="@+id/fragment_me_line_asregards_il"
- layout="@layout/fragment_me_line" />
- </LinearLayout>
+ <include
+ android:id="@+id/fragment_me_line_set_il"
+ layout="@layout/fragment_me_line" />
+ <!--鍏充簬-->
+ <include
+ android:id="@+id/fragment_me_line_asregards_il"
+ layout="@layout/fragment_me_line" />
+ </LinearLayout>
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ </androidx.core.widget.NestedScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0