From f10cda784bede39a861566850898747c38e6c94f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 21 一月 2025 15:32:54 +0800
Subject: [PATCH] 2025年01月21日15:31:52

---
 app/src/main/res/layout/activity_account_and_security.xml |   52 +++++++++++++++++++++++++++++++++-------------------
 1 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/app/src/main/res/layout/activity_account_and_security.xml b/app/src/main/res/layout/activity_account_and_security.xml
index e8c4206..ad7d46a 100644
--- a/app/src/main/res/layout/activity_account_and_security.xml
+++ b/app/src/main/res/layout/activity_account_and_security.xml
@@ -4,13 +4,18 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/text_FFECECEC"
+    android:background="@color/text_FF000000"
     tools:context=".ui.me.AccountAndSecurityActivity">
 
     <include
         android:id="@+id/toolbar_top_rl"
-        layout="@layout/toolbar_top_view_44" />
-
+        layout="@layout/toolbar_top_view_44"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_44"
+        android:layout_marginTop="@dimen/dp_38"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
 
     <include
@@ -37,30 +42,39 @@
         layout="@layout/set_line"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_57"
-        android:layout_marginTop="@dimen/dp_12"
+        android:layout_marginTop="@dimen/dp_10"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/set_account_mail_il" />
 
-    <!--鏆傛椂闅愯棌娉ㄩ攢璐﹀彿缁勪欢-->
-    <TextView
-        android:id="@+id/set_account_close"
+    <include
+        android:id="@+id/set_account_close_il"
+        layout="@layout/set_line"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_52"
-        android:layout_marginStart="@dimen/dp_20"
-        android:layout_marginEnd="@dimen/dp_20"
-        android:layout_marginBottom="@dimen/dp_55"
-        android:background="@drawable/backgruond_ff6b6b"
-        android:gravity="center"
-        android:text="@string/set_close_account"
-        android:textColor="@color/text_FFFFFFFF"
-        android:textSize="@dimen/text_18"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_height="@dimen/dp_57"
+        android:layout_marginTop="@dimen/dp_10"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/set_change_psw_il" />
 
-        />
+<!--    &lt;!&ndash;鏆傛椂闅愯棌娉ㄩ攢璐﹀彿缁勪欢&ndash;&gt;-->
+<!--    <TextView-->
+<!--        android:id="@+id/set_account_close"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="@dimen/dp_52"-->
+<!--        android:layout_marginStart="@dimen/dp_20"-->
+<!--        android:layout_marginEnd="@dimen/dp_20"-->
+<!--        android:layout_marginBottom="@dimen/dp_55"-->
+<!--        android:background="@drawable/backgruond_ff6b6b"-->
+<!--        android:gravity="center"-->
+<!--        android:text="@string/set_close_account"-->
+<!--        android:textColor="@color/text_FFFFFFFF"-->
+<!--        android:textSize="@dimen/text_18"-->
+<!--        app:layout_constraintBottom_toBottomOf="parent"-->
+<!--        app:layout_constraintEnd_toEndOf="parent"-->
+<!--        app:layout_constraintStart_toStartOf="parent"-->
+
+<!--        />-->
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

--
Gitblit v1.8.0