From a14072af00157e418485750f3cae705b8a4cd46b Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Fri, 8 May 2026 15:49:35 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E8=A1=A5=E5=85=85=20SCALE=5FORDER=5F1?=
 =?UTF-8?q?=20=E9=85=8D=E7=BD=AE=E3=80=81Weigher2=20unInit=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=8F=8A=E8=B0=83=E6=96=99=E5=88=97=E8=A1=A8=E6=A8=A1?=
 =?UTF-8?q?=E6=8B=9F=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ScaleDeviceConfig：新增 SCALE_ORDER_1 单秤地址列表
- Weigher2：unInit() 补充调用 Weigher.unInit()，确保串口资源正确释放
- SeasoningSelectDialog：getGoodsList 临时改为模拟数据，待联调时切回真实接口

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../match/dialog/SeasoningSelectDialog.kt     | 23 +++++++++++++++----
 .../dish/match/scale/ScaleDeviceConfig.kt     |  3 +++
 .../com/shuwei/dish/match/utils/Weigher2.java |  3 +++
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/shuwei/dish/match/dialog/SeasoningSelectDialog.kt b/app/src/main/java/com/shuwei/dish/match/dialog/SeasoningSelectDialog.kt
index c72c27b..5bff4a2 100644
--- a/app/src/main/java/com/shuwei/dish/match/dialog/SeasoningSelectDialog.kt
+++ b/app/src/main/java/com/shuwei/dish/match/dialog/SeasoningSelectDialog.kt
@@ -186,12 +186,25 @@ class SeasoningSelectDialog(
      * 请求调料列表
      */
     private fun getGoodsList() {
-        activity.netViewModel.queryGoodsList(
-            goodsType = "1",
-            pageNum = pageNo,
-            pageSize = PAGE_SIZE,
-            goodsName = goodsName.takeUnless { it.isNullOrBlank() }
+//        activity.netViewModel.queryGoodsList(
+//            goodsType = "1",
+//            pageNum = pageNo,
+//            pageSize = PAGE_SIZE,
+//            goodsName = goodsName.takeUnless { it.isNullOrBlank() }
+//        )
+
+        // TODO: 联调时注释掉下方模拟数据，改为真实接口调用
+        val nameList = listOf(
+            "盐", "白砂糖","冰糖", "鸡精", "味精", "陈醋", "老抽", "生抽", "番茄酱", "胡椒粉", "孜然", "十三香",
+            "料酒", "白醋", "蚝油", "辣椒面", "辣椒酱", "豆瓣酱", "淀粉", "葱", "蒜", "姜", "香菜", "油"
         )
+
+        val mockData = mutableListOf<GoodsItem>()
+        nameList.forEachIndexed { index, name ->
+            val padString = "${index + 1}".padStart(2, '0')
+            mockData.add(GoodsItem(goodsId = "1000$padString", goodsName = name))
+        }
+        loadGoodsList(mockData)
     }
 
     /**
diff --git a/app/src/main/java/com/shuwei/dish/match/scale/ScaleDeviceConfig.kt b/app/src/main/java/com/shuwei/dish/match/scale/ScaleDeviceConfig.kt
index e47ca49..73e29a6 100644
--- a/app/src/main/java/com/shuwei/dish/match/scale/ScaleDeviceConfig.kt
+++ b/app/src/main/java/com/shuwei/dish/match/scale/ScaleDeviceConfig.kt
@@ -17,6 +17,9 @@ object ScaleDeviceConfig {
     /** 18个秤的显示顺序（按物理位置排列） */
     val SCALE_ORDER_18 = listOf(6, 5, 4, 3, 2, 1, 12, 11, 10, 9, 8, 7, 18, 17, 16, 15, 14, 13)
 
+    /** 1个秤的地址列表 */
+    val SCALE_ORDER_1 = listOf(1)
+
     /** 设备在列表中的显示顺序 */
     val DEVICE_ORDER = listOf(DEVICE_ID_2, DEVICE_ID_22, DEVICE_ID_18, DEVICE_ID_1)
 }
diff --git a/app/src/main/java/com/shuwei/dish/match/utils/Weigher2.java b/app/src/main/java/com/shuwei/dish/match/utils/Weigher2.java
index b9e269b..d702508 100644
--- a/app/src/main/java/com/shuwei/dish/match/utils/Weigher2.java
+++ b/app/src/main/java/com/shuwei/dish/match/utils/Weigher2.java
@@ -8,6 +8,8 @@ package com.shuwei.dish.match.utils;
 
 import android.os.Build;
 import android.util.Log;
+
+import com.aithings.Weigher;
 import com.blankj.utilcode.util.Utils;
 import com.t507.System;
 import com.wabon.wbintelligenthardwaresdk.api.SensorScale;
@@ -73,6 +75,7 @@ public class Weigher2 {
 
     public static void unInit() {
         // $FF: Couldn't be decompiled
+        Weigher.unInit();
     }
 
     public static void config() {