From 8c04e8e9e28f7fdf1df36f2630bd998d0acc746c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 21 十月 2024 14:01:41 +0800
Subject: [PATCH] 更新uniSDk后，Android14打开uni界面正常
---
app/src/main/res/layout/activity_set.xml | 94 ++++++++++++++---------------------------------
1 files changed, 28 insertions(+), 66 deletions(-)
diff --git a/app/src/main/res/layout/activity_set.xml b/app/src/main/res/layout/activity_set.xml
index 2d6d07f..b842069 100644
--- a/app/src/main/res/layout/activity_set.xml
+++ b/app/src/main/res/layout/activity_set.xml
@@ -4,20 +4,23 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/text_FFECECEC"
tools:context=".ui.me.SetActivity">
<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" />
<ScrollView
android:id="@+id/set_sll"
android:layout_width="match_parent"
android:layout_height="0dp"
- app:layout_constraintBottom_toBottomOf="parent"
+ android:layout_marginTop="@dimen/dp_12"
+ android:layout_marginBottom="@dimen/dp_20"
+ app:layout_constraintBottom_toTopOf="@+id/out_tv"
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">
<LinearLayout
android:id="@+id/sll_ll"
@@ -27,78 +30,37 @@
android:orientation="vertical">
<include
- android:id="@+id/set_account_il"
- layout="@layout/set_title_line" />
-
- <include
- android:id="@+id/set_nickname_il"
+ android:id="@+id/set_language_il"
layout="@layout/set_line" />
<include
- android:id="@+id/set_change_password_il"
+ android:id="@+id/set_account_security_il"
layout="@layout/set_line" />
<include
- android:id="@+id/set_close_account_il"
+ android:id="@+id/set_temperature_unit_il"
layout="@layout/set_line" />
-
- <include
- android:id="@+id/set_mes_il"
- layout="@layout/set_title_line" />
-
- <include
- android:id="@+id/set_push_msg_il"
- layout="@layout/set_line" />
-
- <include
- android:id="@+id/set_call_msg_il"
- layout="@layout/set_line" />
-
- <include
- android:id="@+id/set_general_msg_il"
- layout="@layout/set_title_line" />
-
- <include
- android:id="@+id/set_multi_language_il"
- layout="@layout/set_line" />
-
- <include
- android:id="@+id/set_data_center_il"
- layout="@layout/set_line" />
-
- <include
- android:id="@+id/set_privacy_il"
- layout="@layout/set_title_line" />
-
- <include
- android:id="@+id/set_system_authorization_il"
- layout="@layout/set_line" />
-
- <include
- android:id="@+id/set_share_il"
- layout="@layout/set_line" />
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_141">
-
- <TextView
- android:id="@+id/out_tv"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_41"
- android:layout_marginStart="@dimen/dp_86"
- android:layout_marginTop="@dimen/dp_50"
- android:layout_marginEnd="@dimen/dp_86"
- android:background="@drawable/out_login"
- android:gravity="center"
- android:text="@string/set_閫�鍑虹櫥褰�"
- android:textColor="@color/text_FF5757"
- android:textSize="@dimen/text_16" />
- </RelativeLayout>
-
</LinearLayout>
</ScrollView>
+ <TextView
+ android:id="@+id/out_tv"
+ 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_logout"
+ 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