From 542a1aebe872632e69b4a42ff629d13bb4e8d6d0 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 22 七月 2025 09:31:14 +0800
Subject: [PATCH] Merge branch '1.3.1'
---
app/src/main/res/layout/activity_account_and_security.xml | 55 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 35 insertions(+), 20 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 4811c11..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,12 +4,18 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_F5F7FA"
+ android:background="@color/text_FF000000"
tools:context=".ui.me.AccountAndSecurityActivity">
<include
- android:id="@+id/toolbar_top_fragment_house_list_rl"
- layout="@layout/toolbar_top_view_52" />
+ android:id="@+id/toolbar_top_rl"
+ 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
@@ -20,7 +26,7 @@
android:layout_marginTop="@dimen/dp_12"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl" />
+ app:layout_constraintTop_toBottomOf="@+id/toolbar_top_rl" />
<include
android:id="@+id/set_account_mail_il"
@@ -36,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" />
- />
+<!-- <!–鏆傛椂闅愯棌娉ㄩ攢璐﹀彿缁勪欢–>-->
+<!-- <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