From 0498501b330d97105f41afc17e88cff40afb3192 Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Wed, 22 Apr 2026 17:35:26 +0800
Subject: [PATCH] =?UTF-8?q?style(ui):=20=E7=BB=9F=E4=B8=80=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 为所有列表项和设置面板应用统一的白色圆角背景样式
- 为可点击区域添加波纹效果提升用户体验
- 修复布局文件中ID命名不规范的问题
- 在设置页面添加右上角功能按钮并实现跳转逻辑
- 导入页面跳转扩展函数支持快速导航到主秤配置页面
- 优化布局参数确保界面元素正确显示和交互响应
---
 .../com/shuwei/dish/match/ui/SettingActivity.kt   |  6 +++++-
 app/src/main/res/layout/activity_setting.xml      | 15 +++++++++++----
 .../main/res/layout/fragment_seasoning_config.xml |  2 ++
 app/src/main/res/layout/list_item_scale22_row.xml |  4 +++-
 app/src/main/res/layout/list_item_scale_row.xml   |  4 +++-
 app/src/main/res/layout/list_type_scale1.xml      |  2 ++
 app/src/main/res/layout/list_type_scale2.xml      |  1 +
 7 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/shuwei/dish/match/ui/SettingActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/SettingActivity.kt
index 58eee9c..b58e40a 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/SettingActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/SettingActivity.kt
@@ -15,6 +15,7 @@ import com.shuwei.dish.match.dialog.CommonDialog
 import com.shuwei.dish.match.utils.SpTool
 import com.shuwei.dish.match.utils.ext.clickWithDebounce
 import com.shuwei.dish.match.utils.ext.gone
+import com.shuwei.dish.match.utils.ext.startActivity
 import com.shuwei.dish.match.utils.ext.visible
 
 /**
@@ -43,7 +44,10 @@ class SettingActivity : BaseActivity() {
         }, titleAction = {
             it.text = "设备设置"
         }, rightIconActon = {
-            it.gone()
+            it.visible()
+            it.clickWithDebounce {
+                startActivity<MasterScaleActivity>()
+            }
         })
 
         initView()
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index 37d2d0b..5474f70 100644
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -8,13 +8,16 @@
     android:orientation="vertical">
 
     <LinearLayout
-        android:id="@+id/ll_cook_mode"
+        android:id="@+id/llCookMode"
         android:layout_width="match_parent"
         android:layout_height="120dp"
         android:orientation="horizontal"
         android:gravity="center_vertical"
+        android:layout_marginTop="10dp"
         android:layout_marginHorizontal="32dp"
-        android:background="@drawable/shape_scale_cell">
+        android:background="@drawable/shape_white_e6_12_corners"
+        android:foreground="?android:attr/selectableItemBackground"
+        android:clipToOutline="true">
 
         <TextView
             android:layout_width="0dp"
@@ -52,7 +55,9 @@
         android:gravity="center_vertical"
         android:layout_marginHorizontal="32dp"
         android:layout_marginTop="32dp"
-        android:background="@drawable/shape_scale_cell">
+        android:background="@drawable/shape_white_e6_12_corners"
+        android:foreground="?android:attr/selectableItemBackground"
+        android:clipToOutline="true">
 
         <TextView
             android:layout_width="0dp"
@@ -81,7 +86,9 @@
         android:gravity="center_vertical"
         android:layout_marginHorizontal="32dp"
         android:layout_marginTop="32dp"
-        android:background="@drawable/shape_scale_cell">
+        android:background="@drawable/shape_white_e6_12_corners"
+        android:foreground="?android:attr/selectableItemBackground"
+        android:clipToOutline="true">
 
         <TextView
             android:layout_width="0dp"
diff --git a/app/src/main/res/layout/fragment_seasoning_config.xml b/app/src/main/res/layout/fragment_seasoning_config.xml
index 981a9a9..f5c5e17 100644
--- a/app/src/main/res/layout/fragment_seasoning_config.xml
+++ b/app/src/main/res/layout/fragment_seasoning_config.xml
@@ -94,6 +94,8 @@
             android:background="@drawable/shape_scale_cell"
             android:gravity="center"
             android:text="-"
+            android:foreground="?android:attr/selectableItemBackground"
+            android:clipToOutline="true"
             android:textColor="@color/home_title"
             android:textSize="28sp" />
 
diff --git a/app/src/main/res/layout/list_item_scale22_row.xml b/app/src/main/res/layout/list_item_scale22_row.xml
index 52ba406..6bb7a87 100644
--- a/app/src/main/res/layout/list_item_scale22_row.xml
+++ b/app/src/main/res/layout/list_item_scale22_row.xml
@@ -6,7 +6,9 @@
     android:gravity="center"
     android:orientation="vertical"
     android:padding="4dp"
-    android:background="@drawable/shape_scale_cell">
+    android:foreground="?android:attr/selectableItemBackground"
+    android:background="@drawable/shape_scale_cell"
+    android:clipToOutline="true">
 
     <TextView
         android:id="@+id/tvAddress"
diff --git a/app/src/main/res/layout/list_item_scale_row.xml b/app/src/main/res/layout/list_item_scale_row.xml
index 9714e0c..833abf7 100644
--- a/app/src/main/res/layout/list_item_scale_row.xml
+++ b/app/src/main/res/layout/list_item_scale_row.xml
@@ -3,13 +3,15 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="340dp"
+    android:foreground="?android:attr/selectableItemBackground"
     android:background="@drawable/shape_scale_cell"
     android:gravity="center"
     android:orientation="vertical"
     android:paddingStart="16dp"
     android:paddingTop="8dp"
     android:paddingEnd="16dp"
-    android:paddingBottom="8dp">
+    android:paddingBottom="8dp"
+    android:clipToOutline="true">
 
     <!-- 秤编号 -->
     <TextView
diff --git a/app/src/main/res/layout/list_type_scale1.xml b/app/src/main/res/layout/list_type_scale1.xml
index a688731..b165a97 100644
--- a/app/src/main/res/layout/list_type_scale1.xml
+++ b/app/src/main/res/layout/list_type_scale1.xml
@@ -34,6 +34,8 @@
         android:gravity="center"
         android:layout_marginTop="5dp"
         android:layout_marginBottom="2dp"
+        android:clipToOutline="true"
+        android:foreground="?android:attr/selectableItemBackground"
         android:background="@drawable/shape_scale_cell">
 
         <TextView
diff --git a/app/src/main/res/layout/list_type_scale2.xml b/app/src/main/res/layout/list_type_scale2.xml
index 845bea2..3868735 100644
--- a/app/src/main/res/layout/list_type_scale2.xml
+++ b/app/src/main/res/layout/list_type_scale2.xml
@@ -29,6 +29,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:baselineAligned="false"
         android:orientation="horizontal"
         android:layout_marginTop="5dp">