From 947afd06e8c0c3616e18239ea42f78dd0f4b8400 Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Fri, 26 Jun 2026 16:43:45 +0800
Subject: [PATCH] =?UTF-8?q?fix(dialog):=20=E4=BF=AE=E5=A4=8DChip=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=AF=B9=E8=AF=9D=E6=A1=86=E7=9A=84=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=92=8C=E5=B8=83=E5=B1=80=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改对话框确认按钮提示文本，使用动态标题变量替代固定文本
- 移除手动设置Chip的LayoutParams，改为直接使用addView方法
- 设置ChipGroup为多行显示以支持更多选项
- 调整布局文件中ChipGroup的宽度为wrap_content并居中对齐
- 添加水平和垂直间距属性以改善Chip排列效果
- 修正ShelfV3Activity中传递给对话框的标题文本格式
---
 .../intelligent/shelves/dialog/ChipSelectDialog.kt    | 11 ++++-------
 .../java/com/sw/scalefusion/shelf/ShelfV3Activity.kt  |  2 +-
 app/src/main/res/layout/dialog_chip_select.xml        |  5 ++++-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/dialog/ChipSelectDialog.kt b/app/src/main/java/com/shuwei/intelligent/shelves/dialog/ChipSelectDialog.kt
index bd57e81..23a8e5b 100644
--- a/app/src/main/java/com/shuwei/intelligent/shelves/dialog/ChipSelectDialog.kt
+++ b/app/src/main/java/com/shuwei/intelligent/shelves/dialog/ChipSelectDialog.kt
@@ -59,7 +59,7 @@ class ChipSelectDialog(context: Context) : Dialog(context, R.style.DialogTheme)
 
         binding.btnConfirm.setOnClickListener {
             if (binding.chipGroup.checkedChipId == -1) {
-                context.toast("请选择净菜分类")
+                context.toast("请选择$dialogTitle")
                 return@setOnClickListener
             }
             onItemSelected?.invoke(selectedIndex)
@@ -99,13 +99,10 @@ class ChipSelectDialog(context: Context) : Dialog(context, R.style.DialogTheme)
                     selectedIndex = index
                 }
             }
-            val params = ChipGroup.LayoutParams(
-                ViewGroup.LayoutParams.WRAP_CONTENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT
-            ).apply {
-                setMargins(8, 5.dp, 8.dp, 5.dp)  // left, top, right, bottom
+            binding.chipGroup.apply {
+                isSingleLine = false
+                addView(chip)
             }
-            binding.chipGroup.addView(chip, params)
         }
     }
 }
diff --git a/app/src/main/java/com/sw/scalefusion/shelf/ShelfV3Activity.kt b/app/src/main/java/com/sw/scalefusion/shelf/ShelfV3Activity.kt
index 4a0bf6c..71a4b04 100644
--- a/app/src/main/java/com/sw/scalefusion/shelf/ShelfV3Activity.kt
+++ b/app/src/main/java/com/sw/scalefusion/shelf/ShelfV3Activity.kt
@@ -358,7 +358,7 @@ class ShelfV3Activity : BaseActivity() {
 
     private fun showChipSelectDialog(categoryList: List<String?>, callback: (Int) -> Unit) {
         ChipSelectDialog(this).apply {
-            dialogTitle = "请选择净菜分类"
+            dialogTitle = "净菜分类"
             items = categoryList
             onItemSelected = callback
             show()
diff --git a/app/src/main/res/layout/dialog_chip_select.xml b/app/src/main/res/layout/dialog_chip_select.xml
index 9765709..494bc27 100644
--- a/app/src/main/res/layout/dialog_chip_select.xml
+++ b/app/src/main/res/layout/dialog_chip_select.xml
@@ -27,10 +27,13 @@
         <!-- ChipGroup 选择区域 -->
         <com.google.android.material.chip.ChipGroup
             android:id="@+id/chipGroup"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
             android:layout_marginHorizontal="30dp"
             android:layout_marginVertical="50dp"
+            app:chipSpacingHorizontal="30dp"
+            app:chipSpacingVertical="18dp"
             app:selectionRequired="false"
             app:singleSelection="true" />