From 200086301aa4e3de5aa2fa4eeac880077a057b03 Mon Sep 17 00:00:00 2001
From: maxinyu <maxinyu@chengkong.com>
Date: Thu, 9 Jul 2026 14:14:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B8=83=E5=B1=80=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E9=9C=80=E8=A6=81=E7=9A=84view?=
 =?UTF-8?q?=E8=83=8C=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/layout/add_linked_user_activity.xml   |  3 +-
 .../main/res/layout/auto_mode_activity.xml    |  4 ---
 .../res/layout/invitation_code_activity.xml   |  1 -
 .../main/res/layout/linked_user_activity.xml  |  3 +-
 app/src/main/res/layout/settings_activity.xml | 30 ++++++++-----------
 .../layout/water_gun_settings_activity.xml    |  5 ----
 6 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/app/src/main/res/layout/add_linked_user_activity.xml b/app/src/main/res/layout/add_linked_user_activity.xml
index a6efd96..0e8c8d3 100644
--- a/app/src/main/res/layout/add_linked_user_activity.xml
+++ b/app/src/main/res/layout/add_linked_user_activity.xml
@@ -42,8 +42,7 @@
         android:layout_height="wrap_content"
         android:background="@color/white"
         android:paddingHorizontal="16dp"
-        android:paddingVertical="12dp"
-        android:layout_marginTop="8dp">
+        android:paddingVertical="12dp">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/auto_mode_activity.xml b/app/src/main/res/layout/auto_mode_activity.xml
index 1b28adc..1950458 100644
--- a/app/src/main/res/layout/auto_mode_activity.xml
+++ b/app/src/main/res/layout/auto_mode_activity.xml
@@ -36,10 +36,6 @@
             android:layout_height="24dp" />
     </LinearLayout>
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="10dp"
-        android:background="@color/face" />
 
     <LinearLayout
         android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/invitation_code_activity.xml b/app/src/main/res/layout/invitation_code_activity.xml
index 1176032..243c53a 100644
--- a/app/src/main/res/layout/invitation_code_activity.xml
+++ b/app/src/main/res/layout/invitation_code_activity.xml
@@ -40,7 +40,6 @@
         android:id="@+id/llExpireTime"
         android:layout_width="match_parent"
         android:layout_height="56dp"
-        android:layout_marginTop="8dp"
         android:background="@color/white"
         android:gravity="center_vertical"
         android:paddingHorizontal="16dp">
diff --git a/app/src/main/res/layout/linked_user_activity.xml b/app/src/main/res/layout/linked_user_activity.xml
index a7d6fce..74e859c 100644
--- a/app/src/main/res/layout/linked_user_activity.xml
+++ b/app/src/main/res/layout/linked_user_activity.xml
@@ -48,8 +48,7 @@
             android:layout_height="wrap_content"
             android:background="@color/white"
             android:paddingHorizontal="16dp"
-            android:paddingVertical="12dp"
-            android:layout_marginTop="8dp">
+            android:paddingVertical="12dp">
 
             <LinearLayout
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/settings_activity.xml
index 03786b3..971880e 100644
--- a/app/src/main/res/layout/settings_activity.xml
+++ b/app/src/main/res/layout/settings_activity.xml
@@ -35,18 +35,16 @@
             android:layout_height="24dp" />
     </LinearLayout>
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="10dp"
-        android:background="@color/face" />
 
     <TextView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="16dp"
-        android:paddingVertical="12dp"
+        android:layout_height="50dp"
         android:text="@string/function_settings"
-        android:textColor="@color/gray"
+        android:textColor="@color/black"
+        android:background="@color/message_bg"
+        android:gravity="bottom"
+        android:paddingStart="20dp"
+        android:paddingBottom="7dp"
         android:textSize="14dp" />
 
     <LinearLayout
@@ -191,18 +189,16 @@
         </LinearLayout>
     </LinearLayout>
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="10dp"
-        android:background="@color/face" />
-
+.
     <TextView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="16dp"
-        android:paddingVertical="12dp"
+        android:layout_height="50dp"
         android:text="@string/basic_settings"
-        android:textColor="@color/gray"
+        android:textColor="@color/black"
+        android:background="@color/message_bg"
+        android:gravity="bottom"
+        android:paddingStart="20dp"
+        android:paddingBottom="7dp"
         android:textSize="14dp" />
 
     <LinearLayout
diff --git a/app/src/main/res/layout/water_gun_settings_activity.xml b/app/src/main/res/layout/water_gun_settings_activity.xml
index 701df61..9a246eb 100644
--- a/app/src/main/res/layout/water_gun_settings_activity.xml
+++ b/app/src/main/res/layout/water_gun_settings_activity.xml
@@ -35,11 +35,6 @@
             android:layout_height="24dp" />
     </LinearLayout>
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="10dp"
-        android:background="@color/face" />
-
     <LinearLayout
         android:id="@+id/itemDistance"
         android:layout_width="match_parent"