refactor(http): 移除旧的HTTP客户端配置并整合到网络管理器中

- 删除了废弃的HttpClient.kt文件中的自定义HTTP客户端实现 - 将基础URL配置从UrlConfig迁移到GlobalData统一管理 - 更新HttpManager使用GlobalData.appBaseUrl作为基础URL - 移除了HttpUtil.kt文件中的遗留HTTP工具类 - 简化了网络层架构，移除重复的配置类
fix(ui): 修复22格高宽比调整后列表高度显示不全
2026-04-24 17:23:27 +08:00 · 2026-04-24 17:14:19 +08:00 · 2026-04-24 16:23:15 +08:00 · 2026-04-24 11:28:59 +08:00 · 2026-04-24 10:07:11 +08:00 · 2026-04-23 17:41:26 +08:00
215 changed files with 13808 additions and 4316 deletions
@@ -1,15 +1,15 @@
 *.iml
 .gradle
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
+/.idea/
 .DS_Store
 /build
 /captures
 .externalNativeBuild
 .cxx
 local.properties
+.claude/
+app/debug/
+app/release/
+# 临时忽略 assets 下的 .pt 模型文件，正式文件就绪后取消此行
+app/src/main/assets/*.pt
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AndroidProjectSystem">
-    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
-  </component>
-</project>
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="21" />
-  </component>
-</project>
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetSelector">
-    <selectionStates>
-      <SelectionState runConfigName="app">
-        <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-09-10T07:28:30.961571900Z">
-          <Target type="DEFAULT_BOOT">
-            <handle>
-              <DeviceId pluginId="Default" identifier="serial=192.168.1.21:5555;connection=bc7af9a5" />
-            </handle>
-          </Target>
-        </DropdownSelection>
-        <DialogSelection />
-      </SelectionState>
-    </selectionStates>
-  </component>
-</project>
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DeviceTable">
-    <option name="columnSorters">
-      <list>
-        <ColumnSorterState>
-          <option name="column" value="Name" />
-          <option name="order" value="ASCENDING" />
-        </ColumnSorterState>
-      </list>
-    </option>
-  </component>
-</project>
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="CHOOSE_PER_TEST" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectMigrations">
-    <option name="MigrateToGradleLocalJavaHome">
-      <set>
-        <option value="$PROJECT_DIR$" />
-      </set>
-    </option>
-  </component>
-</project>
@@ -1,9 +0,0 @@
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
-        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
-        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
-        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
-        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
-        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
-        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
-        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
@@ -0,0 +1,4 @@
+kotlin version: 2.0.21
+error message: The daemon has terminated unexpectedly on startup attempt #1 with error code: 0. The daemon process output:
+    1. Kotlin compile daemon is ready
+
@@ -1,8 +1,14 @@

 plugins {
-    alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
-    id("com.google.devtools.ksp") version "2.0.21-1.0.27"
+//    alias(libs.plugins.android.application)
+//    alias(libs.plugins.kotlin.android)
+//    id("com.google.devtools.ksp") version "2.0.21-1.0.27"
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+//    id("com.google.dagger.hilt.android")
+    id("com.google.devtools.ksp")
+    id("kotlin-parcelize")
+    kotlin("kapt")
 }

 android {
@@ -24,7 +30,7 @@ android {
        }

        // 设置输出APK文件名格式
-        setProperty("archivesBaseName", "菜品配比终端v${versionName}")
+        setProperty("archivesBaseName", "pbc_v${versionName}")
    }
    signingConfigs {
        create("debug_507") {
@@ -42,10 +48,12 @@ android {
                "proguard-rules.pro"
            )
            signingConfig = signingConfigs.getByName("debug_507")
+//            buildConfigField("boolean", "DEBUG", "false")
        }
        debug {
            //507扫码秤主板在android.buildTypes{}内增加
            signingConfig = signingConfigs.getByName("debug_507")
+//            buildConfigField("boolean", "DEBUG", "true")
        }
    }
    compileOptions {
@@ -57,6 +65,7 @@ android {
    }
    buildFeatures {
        viewBinding = true
+        buildConfig = true
    }
    packagingOptions {
        pickFirst("lib/armeabi-v7a/libserial_port.so")
@@ -74,7 +83,9 @@ android {
    }
 //    li
 }
-
+val isDebug = gradle.startParameter.taskNames.any {
+    it.contains("debug", ignoreCase = true)
+}
 dependencies {
    implementation(fileTree("libs") { include("*.jar", "*.aar") })
    implementation(libs.androidx.core.ktx)
@@ -86,30 +97,56 @@ dependencies {
    testImplementation(libs.junit)
    androidTestImplementation(libs.androidx.junit)
    androidTestImplementation(libs.androidx.espresso.core)
+    implementation(libs.androidx.activity.ktx)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.lifecycle.viewmodel.ktx)

-    implementation("com.squareup.okhttp3:okhttp:4.9.1")
-    implementation("com.google.code.gson:gson:2.10.1")
-//    implementation("com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.30")
+    implementation(libs.gson)
+    implementation(libs.okhttp)
+    implementation(libs.logging.interceptor)
+    implementation(libs.retrofit)
+    implementation(libs.java.websocket)
+    implementation(libs.converter.gson)
+    implementation(libs.flexbox)

-    implementation("io.github.cymchad:BaseRecyclerViewAdapterHelper4:4.1.2")
+    implementation(libs.baserecyclerviewadapterhelper4)

-    implementation("androidx.room:room-runtime:2.5.2")
-    ksp("androidx.room:room-compiler:2.5.2")
-    implementation("androidx.room:room-ktx:2.5.2") // Kotlin扩展
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7")
-    implementation("androidx.activity:activity-ktx:1.8.0")
+    // room
+    implementation(libs.androidx.room.runtime)
+    ksp(libs.androidx.room.compiler)
+    implementation(libs.androidx.room.ktx)

 //    implementation("biz.laenger.android:vpbs:0.0.6")

-    //必须 1.0.0 以上
-    implementation("io.github.scwang90:refresh-layout-kernel:3.0.0-alpha")
-    //核心必须依赖
-    implementation("io.github.scwang90:refresh-header-classics:3.0.0-alpha")
-    //经典刷新头
-    implementation("io.github.scwang90:refresh-header-radar:3.0.0-alpha")
-    implementation("io.github.scwang90:refresh-footer-classics:3.0.0-alpha")
-    //经典加载
+    // refresh-layout
+    implementation(libs.refresh.layout.kernel)
+    implementation(libs.refresh.header.classics)
+    implementation(libs.refresh.header.radar)
+    implementation(libs.refresh.footer.classics)

    //implementation("com.geyifeng.immersionbar:immersionbar:3.2.2")
+
+    // glide
+    implementation(libs.glide)
+    annotationProcessor(libs.compiler)
+
+    // camerax
+    implementation(libs.androidx.camera.core)
+    implementation(libs.androidx.camera.camera2)
+    implementation(libs.androidx.camera.lifecycle)
+    implementation(libs.androidx.camera.view)
+    implementation(libs.androidx.camera.extensions)
+
+    //pytorch
+    implementation (libs.pytorch.android)
+    implementation (libs.pytorch.android.torchvision)
+
+    // objectbox
+    if (isDebug) {
+        debugImplementation(libs.objectbox.android.objectbrowser)
+    } else {
+        releaseImplementation(libs.objectbox.android)
    }
+}
+
+apply(plugin = "io.objectbox")
@@ -0,0 +1,49 @@
+{
+  "_note1": "KEEP THIS FILE! Check it into a version control system (VCS) like git.",
+  "_note2": "ObjectBox manages crucial IDs for your object model. See docs for details.",
+  "_note3": "If you have VCS merge conflicts, you must resolve them according to ObjectBox docs.",
+  "entities": [
+    {
+      "id": "1:6465153867413579585",
+      "lastPropertyId": "4:3660727688686055762",
+      "name": "Food",
+      "properties": [
+        {
+          "id": "1:3688350375714699356",
+          "name": "id",
+          "type": 6,
+          "flags": 1
+        },
+        {
+          "id": "2:6503828433160216329",
+          "name": "name",
+          "type": 9
+        },
+        {
+          "id": "3:1726525909323356793",
+          "name": "foodIdx",
+          "type": 5
+        },
+        {
+          "id": "4:3660727688686055762",
+          "name": "foodVector",
+          "indexId": "1:5497952887792054610",
+          "type": 28,
+          "flags": 8
+        }
+      ],
+      "relations": []
+    }
+  ],
+  "lastEntityId": "1:6465153867413579585",
+  "lastIndexId": "1:5497952887792054610",
+  "lastRelationId": "0:0",
+  "lastSequenceId": "0:0",
+  "modelVersion": 5,
+  "modelVersionParserMinimum": 5,
+  "retiredEntityUids": [],
+  "retiredIndexUids": [],
+  "retiredPropertyUids": [],
+  "retiredRelationUids": [],
+  "version": 1
+}
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:sharedUserId="android.uid.system">
-
+    xmlns:tools="http://schemas.android.com/tools">
+    <!--  android:sharedUserId="android.uid.system" -->
    <uses-feature android:name="android.hardware.usb.host" />

+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+
    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.CAMERA" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"
        tools:ignore="ProtectedPermissions" />
@@ -41,7 +45,6 @@
        <activity
            android:name=".ui.InitActivity"
            android:exported="true"
-            android:screenOrientation="portrait"
            tools:ignore="DiscouragedApi,LockedOrientationActivity">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
@@ -50,24 +53,29 @@
            </intent-filter>
        </activity>
        <activity android:name=".ui.HomeActivity"
+            android:theme="@style/Theme.DishMatch.NoSplash"
            android:screenOrientation="portrait"
            tools:ignore="DiscouragedApi,LockedOrientationActivity" />

        <activity
            android:name=".ui.SelectDishActivity"
+            android:theme="@style/Theme.DishMatch.NoSplash"
            android:launchMode="singleTask"
            android:screenOrientation="portrait"
            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
        <activity
            android:name=".ui.PrepareCookActivity"
+            android:theme="@style/Theme.DishMatch.NoSplash"
            android:screenOrientation="portrait"
            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
        <activity
            android:name=".ui.DishSamplingActivity"
+            android:theme="@style/Theme.DishMatch.NoSplash"
            android:screenOrientation="portrait"
            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
        <activity
            android:name=".ui.SamplingListActivity"
+            android:theme="@style/Theme.DishMatch.NoSplash"
            android:launchMode="singleTask"
            android:screenOrientation="portrait"
            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
@@ -82,10 +90,42 @@
 <!--            tools:ignore="DiscouragedApi,LockedOrientationActivity" />-->
        <activity
            android:name=".ui.FoodSearchActivity"
+            android:theme="@style/Theme.DishMatch.NoSplash"
            android:screenOrientation="portrait"
            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
-        <activity android:name="com.shuwei.dish.match.ui.DeviceConfigActivity" />
-        <activity android:name="com.shuwei.dish.match.ui.SubmitFoodActivity" />
+<!--        <activity android:name="com.shuwei.dish.match.ui.DeviceConfigActivity"-->
+<!--            android:theme="@style/Theme.DishMatch.NoSplash" />-->
+        <activity android:name="com.shuwei.dish.match.ui.SettingActivity"
+            android:theme="@style/Theme.DishMatch.NoSplash"
+            android:screenOrientation="portrait"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
+        <activity android:name="com.shuwei.dish.match.ui.SubmitFoodActivity"
+            android:theme="@style/Theme.DishMatch.NoSplash" />
+        <activity
+            android:name="com.shuwei.dish.match.ui.MasterScaleActivity"
+            android:theme="@style/Theme.DishMatch.NoSplash"
+            android:screenOrientation="portrait"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
+        <activity
+            android:name="com.shuwei.dish.match.ui.SingleFragmentActivity"
+            android:theme="@style/Theme.DishMatch.NoSplash"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
+        <activity
+            android:name="com.shuwei.dish.match.ui.FoodRecognizeActivity"
+            android:theme="@style/Theme.DishMatch.NoSplash"
+            android:screenOrientation="portrait"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
+        <activity
+            android:name="com.shuwei.dish.match.ui.CollectedFoodActivity"
+            android:theme="@style/Theme.DishMatch.NoSplash"
+            android:screenOrientation="portrait"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
+        <activity
+            android:name="com.shuwei.dish.match.ui.SlaveActivity"
+            android:theme="@style/Theme.DishMatch.NoSplash"
+            android:launchMode="singleTask"
+            android:screenOrientation="landscape"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity" />

        <receiver
            android:name=".utils.BootReceiver"
@@ -0,0 +1,272 @@
+{
+  "class_names": [
+    "三黄鸡",
+    "上海青WP2026020200041",
+    "冰草WP2026020900054",
+    "刀豆",
+    "北豆腐WP2025111900007",
+    "味精WP2026013000034",
+    "圆生菜WP2026020900053",
+    "圆白菜[卷心菜，包菜]WP2025111000063",
+    "基围虾WP2025110700019",
+    "多宝鱼WP2025112600011",
+    "大白菜(代表值)WP2026022800638",
+    "大葱WP2026013000025",
+    "姜[黄姜]WP2026022800956",
+    "娃娃菜WP2026020200005",
+    "小白菜WP2026022800031",
+    "小米辣椒WP2026013000027",
+    "小葱WP2026013000029",
+    "山药（带皮）WP2026020200008",
+    "巨人笋",
+    "广东菜心WP2025120100014",
+    "木耳(干)[黑木耳，云耳]WP2026022801182",
+    "杏鲍菇WP2026022700030",
+    "松花蛋",
+    "松茸菌WP2025120100016",
+    "沙葱",
+    "海带(浸)[江白菜，昆布]WP2026022800035",
+    "牛腩WP2025110700043",
+    "猪五花肉WP2026020300048",
+    "猪腿肉WP2025110700040",
+    "玉米WP2025120100017",
+    "玉米糁(黄)WP2026022800038",
+    "番茄[西红柿]WP2026021000028",
+    "白吉饼WP2026013000024",
+    "笋",
+    "粉丝",
+    "紫甘蓝",
+    "红心萝卜[心里美]WP2026022800368",
+    "红提子WP2025111900006",
+    "红椒WP2026030300055",
+    "红洋葱WP2026030600054",
+    "红美人椒WP2026020300049",
+    "红薯",
+    "红薯粉条（袋）",
+    "羊排WP2025120300021",
+    "羊血WP2026013000038",
+    "胡萝卜WP2025110600008",
+    "芋头",
+    "花卷",
+    "芹菜WP2025111000065",
+    "苦菊",
+    "茄子（紫皮，长）WP2025110700024",
+    "茼蒿WP2026020200045",
+    "莲藕（带皮）",
+    "莴笋（鲜）[莴苣]WP2026020200009",
+    "菜花（白色）[花椰菜]",
+    "菠菜（鲜）[赤根菜]WP2026022800700",
+    "蒜WP2025111400003",
+    "蒜苗WP2026013000028",
+    "蒜薹（圆）",
+    "蒸鱼豉油WP2026013000032",
+    "薏米[薏仁米，苡米]WP2026022800037",
+    "西兰花[绿菜花]WP2025110700029",
+    "西葫芦",
+    "豆腐皮WP2025111000059",
+    "豆角",
+    "辣椒(红，小)WP2025111000066",
+    "辣椒(青，尖)WP2026022800504",
+    "醪糟",
+    "金针菇[(鲜)[智力菇]WP2026030600051",
+    "青线椒WP2026013000031",
+    "韭菜WP2026020200044",
+    "韭黄",
+    "馒头(代表值)WP2026030600056",
+    "香椿[香椿芽]WP2026022801086",
+    "香菇(鲜)[香蕈，冬菇]WP2026030600050",
+    "香菜WP2026013000030",
+    "马铃薯[土豆、洋芋]WP2026012900001",
+    "鸡全腿（带骨）",
+    "鸡翅（带骨）",
+    "鸡腿肉WP2025110700048",
+    "鸡腿（带骨）",
+    "鸡蛋WP2026013000039",
+    "麦芹",
+    "黄瓜（鲜）[胡瓜]WP2025110700031",
+    "黄豆芽WP2026020200042",
+    "黑袋子",
+    "黑鱼（整条鱼）WP2025110600012"
+  ],
+  "class_to_idx": {
+    "三黄鸡": 0,
+    "上海青WP2026020200041": 1,
+    "冰草WP2026020900054": 2,
+    "刀豆": 3,
+    "北豆腐WP2025111900007": 4,
+    "味精WP2026013000034": 5,
+    "圆生菜WP2026020900053": 6,
+    "圆白菜[卷心菜，包菜]WP2025111000063": 7,
+    "基围虾WP2025110700019": 8,
+    "多宝鱼WP2025112600011": 9,
+    "大白菜(代表值)WP2026022800638": 10,
+    "大葱WP2026013000025": 11,
+    "姜[黄姜]WP2026022800956": 12,
+    "娃娃菜WP2026020200005": 13,
+    "小白菜WP2026022800031": 14,
+    "小米辣椒WP2026013000027": 15,
+    "小葱WP2026013000029": 16,
+    "山药（带皮）WP2026020200008": 17,
+    "巨人笋": 18,
+    "广东菜心WP2025120100014": 19,
+    "木耳(干)[黑木耳，云耳]WP2026022801182": 20,
+    "杏鲍菇WP2026022700030": 21,
+    "松花蛋": 22,
+    "松茸菌WP2025120100016": 23,
+    "沙葱": 24,
+    "海带(浸)[江白菜，昆布]WP2026022800035": 25,
+    "牛腩WP2025110700043": 26,
+    "猪五花肉WP2026020300048": 27,
+    "猪腿肉WP2025110700040": 28,
+    "玉米WP2025120100017": 29,
+    "玉米糁(黄)WP2026022800038": 30,
+    "番茄[西红柿]WP2026021000028": 31,
+    "白吉饼WP2026013000024": 32,
+    "笋": 33,
+    "粉丝": 34,
+    "紫甘蓝": 35,
+    "红心萝卜[心里美]WP2026022800368": 36,
+    "红提子WP2025111900006": 37,
+    "红椒WP2026030300055": 38,
+    "红洋葱WP2026030600054": 39,
+    "红美人椒WP2026020300049": 40,
+    "红薯": 41,
+    "红薯粉条（袋）": 42,
+    "羊排WP2025120300021": 43,
+    "羊血WP2026013000038": 44,
+    "胡萝卜WP2025110600008": 45,
+    "芋头": 46,
+    "花卷": 47,
+    "芹菜WP2025111000065": 48,
+    "苦菊": 49,
+    "茄子（紫皮，长）WP2025110700024": 50,
+    "茼蒿WP2026020200045": 51,
+    "莲藕（带皮）": 52,
+    "莴笋（鲜）[莴苣]WP2026020200009": 53,
+    "菜花（白色）[花椰菜]": 54,
+    "菠菜（鲜）[赤根菜]WP2026022800700": 55,
+    "蒜WP2025111400003": 56,
+    "蒜苗WP2026013000028": 57,
+    "蒜薹（圆）": 58,
+    "蒸鱼豉油WP2026013000032": 59,
+    "薏米[薏仁米，苡米]WP2026022800037": 60,
+    "西兰花[绿菜花]WP2025110700029": 61,
+    "西葫芦": 62,
+    "豆腐皮WP2025111000059": 63,
+    "豆角": 64,
+    "辣椒(红，小)WP2025111000066": 65,
+    "辣椒(青，尖)WP2026022800504": 66,
+    "醪糟": 67,
+    "金针菇[(鲜)[智力菇]WP2026030600051": 68,
+    "青线椒WP2026013000031": 69,
+    "韭菜WP2026020200044": 70,
+    "韭黄": 71,
+    "馒头(代表值)WP2026030600056": 72,
+    "香椿[香椿芽]WP2026022801086": 73,
+    "香菇(鲜)[香蕈，冬菇]WP2026030600050": 74,
+    "香菜WP2026013000030": 75,
+    "马铃薯[土豆、洋芋]WP2026012900001": 76,
+    "鸡全腿（带骨）": 77,
+    "鸡翅（带骨）": 78,
+    "鸡腿肉WP2025110700048": 79,
+    "鸡腿（带骨）": 80,
+    "鸡蛋WP2026013000039": 81,
+    "麦芹": 82,
+    "黄瓜（鲜）[胡瓜]WP2025110700031": 83,
+    "黄豆芽WP2026020200042": 84,
+    "黑袋子": 85,
+    "黑鱼（整条鱼）WP2025110600012": 86
+  },
+  "idx_to_class": {
+    "0": "三黄鸡",
+    "1": "上海青WP2026020200041",
+    "2": "冰草WP2026020900054",
+    "3": "刀豆",
+    "4": "北豆腐WP2025111900007",
+    "5": "味精WP2026013000034",
+    "6": "圆生菜WP2026020900053",
+    "7": "圆白菜[卷心菜，包菜]WP2025111000063",
+    "8": "基围虾WP2025110700019",
+    "9": "多宝鱼WP2025112600011",
+    "10": "大白菜(代表值)WP2026022800638",
+    "11": "大葱WP2026013000025",
+    "12": "姜[黄姜]WP2026022800956",
+    "13": "娃娃菜WP2026020200005",
+    "14": "小白菜WP2026022800031",
+    "15": "小米辣椒WP2026013000027",
+    "16": "小葱WP2026013000029",
+    "17": "山药（带皮）WP2026020200008",
+    "18": "巨人笋",
+    "19": "广东菜心WP2025120100014",
+    "20": "木耳(干)[黑木耳，云耳]WP2026022801182",
+    "21": "杏鲍菇WP2026022700030",
+    "22": "松花蛋",
+    "23": "松茸菌WP2025120100016",
+    "24": "沙葱",
+    "25": "海带(浸)[江白菜，昆布]WP2026022800035",
+    "26": "牛腩WP2025110700043",
+    "27": "猪五花肉WP2026020300048",
+    "28": "猪腿肉WP2025110700040",
+    "29": "玉米WP2025120100017",
+    "30": "玉米糁(黄)WP2026022800038",
+    "31": "番茄[西红柿]WP2026021000028",
+    "32": "白吉饼WP2026013000024",
+    "33": "笋",
+    "34": "粉丝",
+    "35": "紫甘蓝",
+    "36": "红心萝卜[心里美]WP2026022800368",
+    "37": "红提子WP2025111900006",
+    "38": "红椒WP2026030300055",
+    "39": "红洋葱WP2026030600054",
+    "40": "红美人椒WP2026020300049",
+    "41": "红薯",
+    "42": "红薯粉条（袋）",
+    "43": "羊排WP2025120300021",
+    "44": "羊血WP2026013000038",
+    "45": "胡萝卜WP2025110600008",
+    "46": "芋头",
+    "47": "花卷",
+    "48": "芹菜WP2025111000065",
+    "49": "苦菊",
+    "50": "茄子（紫皮，长）WP2025110700024",
+    "51": "茼蒿WP2026020200045",
+    "52": "莲藕（带皮）",
+    "53": "莴笋（鲜）[莴苣]WP2026020200009",
+    "54": "菜花（白色）[花椰菜]",
+    "55": "菠菜（鲜）[赤根菜]WP2026022800700",
+    "56": "蒜WP2025111400003",
+    "57": "蒜苗WP2026013000028",
+    "58": "蒜薹（圆）",
+    "59": "蒸鱼豉油WP2026013000032",
+    "60": "薏米[薏仁米，苡米]WP2026022800037",
+    "61": "西兰花[绿菜花]WP2025110700029",
+    "62": "西葫芦",
+    "63": "豆腐皮WP2025111000059",
+    "64": "豆角",
+    "65": "辣椒(红，小)WP2025111000066",
+    "66": "辣椒(青，尖)WP2026022800504",
+    "67": "醪糟",
+    "68": "金针菇[(鲜)[智力菇]WP2026030600051",
+    "69": "青线椒WP2026013000031",
+    "70": "韭菜WP2026020200044",
+    "71": "韭黄",
+    "72": "馒头(代表值)WP2026030600056",
+    "73": "香椿[香椿芽]WP2026022801086",
+    "74": "香菇(鲜)[香蕈，冬菇]WP2026030600050",
+    "75": "香菜WP2026013000030",
+    "76": "马铃薯[土豆、洋芋]WP2026012900001",
+    "77": "鸡全腿（带骨）",
+    "78": "鸡翅（带骨）",
+    "79": "鸡腿肉WP2025110700048",
+    "80": "鸡腿（带骨）",
+    "81": "鸡蛋WP2026013000039",
+    "82": "麦芹",
+    "83": "黄瓜（鲜）[胡瓜]WP2025110700031",
+    "84": "黄豆芽WP2026020200042",
+    "85": "黑袋子",
+    "86": "黑鱼（整条鱼）WP2025110600012"
+  },
+  "embedding_dim": 512,
+  "total_images": 2093,
+  "build_time": "2026-03-10T10:33:47.104848"
+}
@@ -0,0 +1,31 @@
+package com.shuwei.dish.match.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.chad.library.adapter4.BaseQuickAdapter
+import com.chad.library.adapter4.viewholder.QuickViewHolder
+import com.shuwei.dish.match.databinding.ListItemCollectedFoodBinding
+import com.shuwei.dish.match.entity.CollectedFoodItem
+
+/**
+ * 已采集食材列表适配器
+ * 展示食材名称和已采集数量，支持删除操作
+ */
+class CollectedFoodAdapter(list: MutableList<CollectedFoodItem>) :
+    BaseQuickAdapter<CollectedFoodItem, CollectedFoodAdapter.VH>(list) {
+
+    /** ViewHolder，持有列表项 ViewBinding */
+    inner class VH(val binding: ListItemCollectedFoodBinding) : QuickViewHolder(binding.root)
+
+    override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
+        val binding = ListItemCollectedFoodBinding.inflate(LayoutInflater.from(context), parent, false)
+        return VH(binding)
+    }
+
+    override fun onBindViewHolder(holder: VH, position: Int, item: CollectedFoodItem?) {
+        item ?: return
+        holder.binding.tvFoodName.text = item.foodName.split("WP").first()
+        holder.binding.tvCollectCount.text = "已采集${item.collectCount}"
+    }
+}
@@ -9,7 +9,9 @@ import com.chad.library.adapter4.viewholder.QuickViewHolder
 import com.shuwei.dish.match.R
 import com.shuwei.dish.match.databinding.ListItemDishCookBinding
 import com.shuwei.dish.match.entity.CookFoodGoodsEntity
+import com.shuwei.dish.match.utils.ext.gone
 import com.shuwei.dish.match.utils.ext.roundedOneDecimalPlace
+import com.shuwei.dish.match.utils.ext.visible
 import java.text.DecimalFormat

 class DishPartAdapter(list: MutableList<CookFoodGoodsEntity>) :
@@ -36,12 +38,16 @@ class DishPartAdapter(list: MutableList<CookFoodGoodsEntity>) :
                    if (item.isSamplingPage) R.color.black999 else R.color.dish_green
                )
            )
+
+            ivOperateIcon.run {
+                if (item.isSamplingPage) gone() else visible()
+            }
+            ivClearIcon.visible()
+            ivClearIcon.setImageResource(
+                if (item.isOriginalData) R.drawable.ic_dish_clear
+                else R.drawable.ic_delete
+            )
            ivOperateIcon.setImageResource(
-                if (item.isSamplingPage)
-                //采集页面
-                    R.drawable.ic_delete
-                else
-                //制作页面
                    if (item.isSetFinished) R.drawable.ic_dish_selected
                    else R.drawable.ic_dish_unselected
            )
@@ -53,5 +59,4 @@ class DishPartAdapter(list: MutableList<CookFoodGoodsEntity>) :
            }
        }
    }
-
 }
@@ -0,0 +1,58 @@
+package com.shuwei.dish.match.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import com.chad.library.adapter4.BaseQuickAdapter
+import com.chad.library.adapter4.viewholder.QuickViewHolder
+import com.shuwei.dish.match.R
+import com.shuwei.dish.match.databinding.ListItemFoodCollectionBinding
+import com.shuwei.dish.match.objbox.FoodCollectionBean
+import com.shuwei.dish.match.utils.ext.load
+
+class FoodCollectionAdapter (var list: MutableList<FoodCollectionBean>) :
+    BaseQuickAdapter<FoodCollectionBean, FoodCollectionAdapter.VH>(list) {
+
+    inner class VH(var binding: ListItemFoodCollectionBinding) : QuickViewHolder(binding.root)
+
+    override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
+        val inflater = LayoutInflater.from(context)
+        val binding = ListItemFoodCollectionBinding.inflate(inflater, parent, false)
+        return VH(binding)
+    }
+
+    override fun onBindViewHolder(holder: VH, position: Int, item: FoodCollectionBean?) {
+        val binding = holder.binding
+        item?.let {
+            binding.ivFinish.visibility = if (it.isFinish) View.VISIBLE else View.GONE
+            binding.ivDelete.visibility = if (it.isShowCamera) View.GONE else View.VISIBLE
+            binding.imageView.run {
+                if (it.isShowCamera) {
+                    scaleType = ImageView.ScaleType.CENTER
+                    setImageResource(R.drawable.ic_camera_default)
+                } else {
+                    //scaleType = ImageView.ScaleType.FIT_CENTER
+                    scaleType = ImageView.ScaleType.CENTER_CROP
+                    //setImageURI(it.imageUri)
+                    //setImageBitmap(it.bitmap)
+                    if (it.imageUri!=null) {
+                        setImageURI(it.imageUri)
+                    } else {
+                        load(it.imageFile)
+                    }
+//                    it.bitmap?.let { bitmap ->
+//                        GlideUtils.loadRoundCornerWitBitmap(
+//                            context,
+//                            url = bitmap,
+//                            imageView = this,
+//                            radius = 8.dp
+//                        )
+//                    }
+                }
+            }
+        }
+    }
+
+}
@@ -9,6 +9,9 @@ import com.chad.library.adapter4.viewholder.QuickViewHolder
 import com.shuwei.dish.match.R
 import com.shuwei.dish.match.databinding.ListItemSearchGoodsInfoBinding
 import com.shuwei.dish.match.entity.CookFoodGoodsEntity
+import com.shuwei.dish.match.utils.ext.gone
+import com.shuwei.dish.match.utils.ext.roundedDecimalPlace
+import com.shuwei.dish.match.utils.ext.visible

 class GoodsInfoSearchAdapter(private var list: MutableList<CookFoodGoodsEntity>) :
    BaseQuickAdapter<CookFoodGoodsEntity, GoodsInfoSearchAdapter.VH>(list) {
@@ -18,20 +21,29 @@ class GoodsInfoSearchAdapter(private var list: MutableList<CookFoodGoodsEntity>)
        position: Int,
        item: CookFoodGoodsEntity?
    ) {
+        item ?: return
        holder.binding.tvGoodsInfo.run {
-            text = item?.goodsName
+            text = item.goodsName
            setBackgroundResource(
-                if (item?.isClicked == true) R.drawable.shape_green_stroke
+                if (item.isClicked == true) R.drawable.shape_green_stroke
                else R.drawable.shape_white_12_corners
            )
            setTextColor(
                ContextCompat.getColor(
                    context,
-                    if (item?.isClicked == true) R.color.dish_green
+                    if (item.isClicked == true) R.color.dish_green
                    else R.color.black666
                )
            )
        }
+        if (item.foodScore == -1){
+            holder.binding.tvFoodScore.gone()
+        } else {
+            holder.binding.tvFoodScore.let {
+                it.visible()
+                it.text = "${(item.foodScore / 100.0).roundedDecimalPlace(2)}%"
+            }
+        }
    }

    override fun onCreateViewHolder(
@@ -41,6 +53,7 @@ class GoodsInfoSearchAdapter(private var list: MutableList<CookFoodGoodsEntity>)
    ): VH {
        val binding =
            ListItemSearchGoodsInfoBinding.inflate(LayoutInflater.from(context), parent, false)
+
        return VH(binding)
    }

@@ -9,7 +9,6 @@ import com.chad.library.adapter4.viewholder.QuickViewHolder
 import com.shuwei.dish.match.R
 import com.shuwei.dish.match.entity.FoodRecord
 import com.shuwei.dish.match.databinding.ListItemDishBinding
-import com.shuwei.dish.match.utils.ext.gone
 import com.shuwei.dish.match.utils.ext.visible
 import java.text.DecimalFormat

@@ -28,9 +27,9 @@ class SamplingAdapter(list: MutableList<FoodRecord>) :
        holder.binding.run {
            val isCooking = item!!.isCooking
            clBlock.setBackgroundResource(R.drawable.shape_white_fb_15_corners)
-            val totalWeight = item!!.totalWeight ?: 0.toDouble()
+            val totalWeight = item.totalWeight ?: 0.toDouble()
            tvDishName.run {
-                text = item!!.foodName
+                text = (item.foodName?:"").ifBlank { "--" }
                setTextColor(
                    ContextCompat.getColor(
                        holder.itemView.context,
@@ -43,9 +42,14 @@ class SamplingAdapter(list: MutableList<FoodRecord>) :
                tvDishCount.text = "制作统计：-kg"
                tvShowState.text = "烹饪中"
            } else {
-                val useWeight = if (totalWeight > 0.toDouble()) totalWeight else (item.foodWeight ?: 0.toDouble())
-                tvDishCount.text = "累计统计：${df.format(useWeight / 1000.0F)}kg(${item.count}次)"
-                tvShowState.text = "${df.format((item.foodWeight ?: 0.toDouble()) / 1000.0F)}kg"
+                val realTotalWeight = if (totalWeight > 0.toDouble()) totalWeight else (item.foodWeight
+                    ?: 0.toDouble())
+                val showTotalWeight =
+                    if (realTotalWeight == 0.toDouble()) "-" else df.format(realTotalWeight / 1000.0F)
+                tvDishCount.text = "累计统计：${showTotalWeight}kg(${item.count ?: "-"}次)"
+                val foodWeight = item.foodWeight ?: 0.toDouble()
+                val showFoodWeight = if (foodWeight == 0.toDouble()) "-" else df.format(foodWeight / 1000.0F)
+                tvShowState.text = "${showFoodWeight}kg"
            }
        }
    }
@@ -0,0 +1,44 @@
+package com.shuwei.dish.match.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.chad.library.adapter4.BaseQuickAdapter
+import com.chad.library.adapter4.viewholder.QuickViewHolder
+import com.shuwei.dish.match.databinding.ListItemScaleRowBinding
+import com.shuwei.dish.match.utils.WeightUtil
+
+/**
+ * 线性列表秤数据 Adapter
+ * 用于 SlaveActivity 非22/18格子设备的秤列表展示
+ */
+class ScaleRowAdapter : BaseQuickAdapter<ScaleRowAdapter.ScaleItem, ScaleRowAdapter.VH>() {
+
+    /**
+     * 秤数据条目
+     * @param address 秤地址
+     * @param weight  重量（克）
+     * @param state   状态码
+     * @param name    调料名称，未配置时为空
+     */
+    data class ScaleItem(val address: Int, val weight: Double, val state: Int, val name: String = "")
+
+    inner class VH(val b: ListItemScaleRowBinding) : QuickViewHolder(b.root)
+
+    override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
+        return VH(ListItemScaleRowBinding.inflate(LayoutInflater.from(context), parent, false))
+    }
+
+    override fun onBindViewHolder(holder: VH, position: Int, item: ScaleItem?) {
+        item ?: return
+        holder.b.tvScaleLabel.text = "秤 ${item.address}"
+        holder.b.tvName.text = item.name.ifEmpty { "-" }
+        holder.b.tvWeight.text = "${item.weight} g"
+        holder.b.tvState.text = when (item.state) {
+            WeightUtil.STATE_STABLE -> "稳定"
+            WeightUtil.STATE_UNSTABLE -> "不稳定"
+            WeightUtil.STATE_OVER_WEIGHT -> "超量"
+            else -> "${item.state}"
+        }
+    }
+}
@@ -0,0 +1,173 @@
+package com.shuwei.dish.match.adapter
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import androidx.core.view.updateLayoutParams
+import androidx.recyclerview.widget.RecyclerView
+import com.chad.library.adapter4.BaseQuickAdapter
+import com.chad.library.adapter4.viewholder.QuickViewHolder
+import com.shuwei.dish.match.R
+import com.shuwei.dish.match.databinding.ListItemScale22RowBinding
+import com.shuwei.dish.match.scale.ScaleData
+import com.shuwei.dish.match.scale.ScaleDeviceConfig
+import com.shuwei.dish.match.utils.WeightUtil
+import com.shuwei.dish.match.utils.ext.dp
+
+/**
+ * 18格网格 Adapter，同时服务于调料配置页和主设备秤总览页。
+ *
+ * @param showNameOnly true = 调料配置模式，仅显示 tvName，隐藏 tvWeight/tvState；
+ *                     false = 秤总览模式，三行全部显示
+ * @param showAddress  true = 显示秤地址行（tvAddress），仅 MasterScaleActivity 使用
+ */
+class Seasoning18GridAdapter(
+    private val showNameOnly: Boolean = false,
+    private val showAddress: Boolean = false,
+    private val leftRightSpace: Int = 10.dp
+) : BaseQuickAdapter<ScaleData, Seasoning18GridAdapter.VH>(mutableListOf()) {
+
+    /** 空位哨兵，address=0 表示无效 */
+    private val empty = ScaleData("", 0, 0.0, -1, 0)
+
+    /** 当前高亮的格子位置，-1 表示无高亮 */
+    private var highlightedPosition: Int = -1
+
+    /** 点击回调 */
+    var onItemClick: ((ScaleData, Int) -> Unit)? = null
+
+    inner class VH(val b: ListItemScale22RowBinding) : QuickViewHolder(b.root)
+
+    /** 前6个位置为第1行（viewType=0，margin大），其余为第2-3行（viewType=1，margin小） */
+    override fun getItemViewType(position: Int, list: List<ScaleData>) =
+        if (position < 6) 0 else 1
+
+    override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
+        val b = ListItemScale22RowBinding.inflate(LayoutInflater.from(context), parent, false)
+        val margin = if (viewType == 0) 12.dp else 2.dp
+        val screenWidth = parent.resources.displayMetrics.widthPixels
+        val cellSize = (screenWidth - 6 * margin * 2 - leftRightSpace) / 6
+        b.root.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+            width = cellSize
+            height = cellSize
+            if (viewType == 0) setMargins(margin, 0, margin, 2.dp)
+            else setMargins(margin, margin, margin, margin)
+        }
+        val baseSp = (cellSize / parent.resources.displayMetrics.density).toInt()
+        b.tvAddress.textSize = (baseSp * 0.14f).coerceIn(8f, 12f)
+        b.tvName.textSize   = (baseSp * 0.18f).coerceIn(10f, 16f)
+        b.tvWeight.textSize = (baseSp * 0.22f).coerceIn(12f, 20f)
+        b.tvState.textSize  = (baseSp * 0.14f).coerceIn(8f, 12f)
+        // 秤地址行：仅 MasterScaleActivity 显示
+        b.tvAddress.visibility = if (showAddress) View.VISIBLE else View.GONE
+        // 调料配置模式隐藏重量和状态行
+        if (showNameOnly) {
+            b.tvWeight.visibility = View.GONE
+            b.tvState.visibility  = View.GONE
+        }
+        val vh = VH(b)
+        b.root.setOnClickListener {
+            val pos = vh.bindingAdapterPosition
+            if (pos != RecyclerView.NO_POSITION) {
+                items.getOrNull(pos)?.takeIf { it.address != 0 }?.let { item -> onItemClick?.invoke(item, pos) }
+            }
+        }
+        return vh
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun onBindViewHolder(holder: VH, position: Int, item: ScaleData?) {
+        val valid = (item?.address ?: 0) != 0
+        if (!valid) {
+            holder.b.tvAddress.text = ""
+            holder.b.tvName.text   = "-"
+            holder.b.tvWeight.text = ""
+            holder.b.tvState.text  = ""
+        } else {
+            holder.b.tvAddress.text = "秤${item!!.address}"
+            holder.b.tvName.text   = if (!item.name.isNullOrBlank()) item.name else "-"
+            holder.b.tvWeight.text = "${item.weight}g"
+            holder.b.tvState.text  = stateStr(item.state)
+        }
+        if (position == highlightedPosition) {
+            holder.b.root.setBackgroundResource(R.drawable.shape_scale_cell_highlight)
+            val white = ContextCompat.getColor(holder.b.root.context, R.color.white)
+            holder.b.tvAddress.setTextColor(white)
+            holder.b.tvName.setTextColor(white)
+            holder.b.tvWeight.setTextColor(white)
+            holder.b.tvState.setTextColor(white)
+        } else {
+            holder.b.root.setBackgroundResource(R.drawable.shape_scale_cell)
+            val normal = ContextCompat.getColor(holder.b.root.context, R.color.home_title)
+            val sub = ContextCompat.getColor(holder.b.root.context, R.color.home_sub_title)
+            holder.b.tvAddress.setTextColor(sub)
+            holder.b.tvName.setTextColor(sub)
+            holder.b.tvWeight.setTextColor(normal)
+            holder.b.tvState.setTextColor(sub)
+        }
+    }
+
+    /**
+     * 高亮指定位置的格子（红底白字），同时清除上一个高亮
+     */
+    fun highlightPosition(position: Int) {
+        val prev = highlightedPosition
+        highlightedPosition = position
+        if (prev >= 0) notifyItemChanged(prev)
+        if (position >= 0) notifyItemChanged(position)
+    }
+
+    /**
+     * 清除所有高亮，恢复默认样式
+     */
+    fun clearHighlight() {
+        highlightPosition(-1)
+    }
+
+    /**
+     * 更新指定位置的名称并刷新对应格子
+     */
+    fun updateItemName(position: Int, name: String) {
+        items.getOrNull(position)?.let {
+            set(position, it.copy(name = name))
+        }
+    }
+
+    /**
+     * 按 SCALE_ORDER_18 的 sort 顺序更新数据，空位用哨兵填充
+     * 只更新显示字段有变化的格子，避免全量刷新导致 ViewHolder 重建影响点击监听
+     */
+    fun update(list: List<ScaleData>) {
+        val byAddress = list.associateBy { it.address }
+        val filled = ScaleDeviceConfig.SCALE_ORDER_18.map { addr ->
+            byAddress[addr] ?: empty.copy(address = addr)
+        }
+        if (items.isEmpty()) {
+            submitList(filled)
+        } else {
+            filled.forEachIndexed { i, scale ->
+                val cur = items.getOrNull(i)
+                if (cur == null || cur.address != scale.address || cur.weight != scale.weight || cur.state != scale.state || cur.name != scale.name) {
+                    set(i, scale)
+                }
+            }
+        }
+    }
+
+    /**
+     * 将 ScaleData 列表按 SCALE_ORDER_18 重排后调用 update
+     */
+    fun updateByAddress(scales: List<ScaleData>) {
+        update(scales)
+    }
+
+    private fun stateStr(state: Int) = when (state) {
+        WeightUtil.STATE_STABLE      -> "稳定"
+        WeightUtil.STATE_UNSTABLE    -> "不稳定"
+        WeightUtil.STATE_OVER_WEIGHT -> "超量"
+        else -> ""
+    }
+}
@@ -0,0 +1,179 @@
+package com.shuwei.dish.match.adapter
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import androidx.core.view.updateLayoutParams
+import androidx.recyclerview.widget.RecyclerView
+import com.chad.library.adapter4.BaseQuickAdapter
+import com.chad.library.adapter4.viewholder.QuickViewHolder
+import com.google.android.flexbox.FlexboxLayoutManager
+import com.shuwei.dish.match.R
+import com.shuwei.dish.match.databinding.ListItemScale22RowBinding
+import com.shuwei.dish.match.scale.ScaleData
+import com.shuwei.dish.match.scale.ScaleDeviceConfig
+import com.shuwei.dish.match.utils.SizeTool
+import com.shuwei.dish.match.utils.WeightUtil
+import com.shuwei.dish.match.utils.ext.dp
+
+/**
+ * 22格网格 Adapter，同时服务于调料配置页和主设备秤总览页。
+ *
+ * @param largeSize       前4个大格子的宽度（px）
+ * @param smallSize       其余小格子的宽度（px）
+ * @param cellAspectRatio 格子高宽比（height / width）
+ * @param showNameOnly    true = 调料配置模式，仅显示 tvName，隐藏 tvWeight/tvState；
+ *                        false = 秤总览模式，三行全部显示
+ * @param showAddress     true = 显示秤地址行（tvAddress），仅 MasterScaleActivity 使用
+ */
+class Seasoning22GridAdapter(
+    private val largeSize: Int,
+    private val smallSize: Int,
+    private val cellAspectRatio: Float = SizeTool.DEFAULT_CELL_ASPECT_RATIO,
+    private val showNameOnly: Boolean = false,
+    private val showAddress: Boolean = false
+) : BaseQuickAdapter<ScaleData, Seasoning22GridAdapter.VH>(mutableListOf()) {
+
+    /** 空位哨兵，address=0 表示无效 */
+    private val empty = ScaleData("", 0, 0.0, -1, 0)
+
+    /** 当前高亮的格子位置，-1 表示无高亮 */
+    private var highlightedPosition: Int = -1
+
+    /** 点击回调 */
+    var onItemClick: ((ScaleData, Int) -> Unit)? = null
+
+    inner class VH(val b: ListItemScale22RowBinding) : QuickViewHolder(b.root)
+
+    /** 前4个位置为大格子（viewType=1），其余为小格子（viewType=0） */
+    override fun getItemViewType(position: Int, list: List<ScaleData>) =
+        if (position < 4) 1 else 0
+
+    override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
+        val b = ListItemScale22RowBinding.inflate(LayoutInflater.from(context), parent, false)
+        val cellWidth = if (viewType == 1) largeSize else smallSize
+        val cellHeight = (cellWidth * cellAspectRatio).toInt()
+        b.root.updateLayoutParams<FlexboxLayoutManager.LayoutParams> {
+            width = cellWidth
+            height = cellHeight
+            setMargins(2.dp, 2.dp, 2.dp, 2.dp)
+        }
+        val baseSp = (cellWidth / parent.resources.displayMetrics.density).toInt()
+        b.tvAddress.textSize = (baseSp * 0.14f).coerceIn(8f, 12f)
+        b.tvName.textSize   = (baseSp * 0.18f).coerceIn(10f, 16f)
+        b.tvWeight.textSize = (baseSp * 0.22f).coerceIn(12f, 20f)
+        b.tvState.textSize  = (baseSp * 0.14f).coerceIn(8f, 12f)
+        // 秤地址行：仅 MasterScaleActivity 显示
+        b.tvAddress.visibility = if (showAddress) View.VISIBLE else View.GONE
+        // 调料配置模式隐藏重量和状态行
+        if (showNameOnly) {
+            b.tvWeight.visibility = View.GONE
+            b.tvState.visibility  = View.GONE
+        }
+        val vh = VH(b)
+        b.root.setOnClickListener {
+            val pos = vh.bindingAdapterPosition
+            if (pos != RecyclerView.NO_POSITION) {
+                items.getOrNull(pos)?.takeIf { it.address != 0 }?.let { item -> onItemClick?.invoke(item, pos) }
+            }
+        }
+        return vh
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun onBindViewHolder(holder: VH, position: Int, item: ScaleData?) {
+        val valid = (item?.address ?: 0) != 0
+        if (!valid) {
+            holder.b.tvAddress.text = ""
+            holder.b.tvName.text   = "-"
+            holder.b.tvWeight.text = ""
+            holder.b.tvState.text  = ""
+        } else {
+            holder.b.tvAddress.text = "秤${item!!.address}"
+            holder.b.tvName.text   = if (!item.name.isNullOrBlank()) item.name else "-"
+            holder.b.tvWeight.text = "${item.weight}g"
+            holder.b.tvState.text  = stateStr(item.state)
+        }
+        // 高亮格子：红底白字；其余恢复默认
+        if (position == highlightedPosition) {
+            holder.b.root.setBackgroundResource(R.drawable.shape_scale_cell_highlight)
+            val white = ContextCompat.getColor(holder.b.root.context, R.color.white)
+            holder.b.tvAddress.setTextColor(white)
+            holder.b.tvName.setTextColor(white)
+            holder.b.tvWeight.setTextColor(white)
+            holder.b.tvState.setTextColor(white)
+        } else {
+            holder.b.root.setBackgroundResource(R.drawable.shape_scale_cell)
+            val normal = ContextCompat.getColor(holder.b.root.context, R.color.home_title)
+            val sub = ContextCompat.getColor(holder.b.root.context, R.color.home_sub_title)
+            holder.b.tvAddress.setTextColor(sub)
+            holder.b.tvName.setTextColor(sub)
+            holder.b.tvWeight.setTextColor(normal)
+            holder.b.tvState.setTextColor(sub)
+        }
+    }
+
+    /**
+     * 高亮指定位置的格子（红底白字），同时清除上一个高亮
+     */
+    fun highlightPosition(position: Int) {
+        val prev = highlightedPosition
+        highlightedPosition = position
+        if (prev >= 0) notifyItemChanged(prev)
+        if (position >= 0) notifyItemChanged(position)
+    }
+
+    /**
+     * 清除所有高亮，恢复默认样式
+     */
+    fun clearHighlight() {
+        highlightPosition(-1)
+    }
+
+    /**
+     * 更新指定位置的名称并刷新对应格子
+     */
+    fun updateItemName(position: Int, name: String) {
+        items.getOrNull(position)?.let {
+            set(position, it.copy(name = name))
+        }
+    }
+
+    /**
+     * 按 SCALE_ORDER_22 的 sort 顺序更新数据，空位用哨兵填充
+     * 只更新显示字段有变化的格子，避免全量刷新导致 ViewHolder 重建影响点击监听
+     */
+    fun update(list: List<ScaleData>) {
+        val byAddress = list.associateBy { it.address }
+        val filled = ScaleDeviceConfig.SCALE_ORDER_22.map { addr ->
+            byAddress[addr] ?: empty.copy(address = addr)
+        }
+        if (items.isEmpty()) {
+            submitList(filled)
+        } else {
+            filled.forEachIndexed { i, scale ->
+                val cur = items.getOrNull(i)
+                if (cur == null || cur.address != scale.address || cur.weight != scale.weight || cur.state != scale.state || cur.name != scale.name) {
+                    set(i, scale)
+                }
+            }
+        }
+    }
+
+    /**
+     * 将 ScaleData 列表按 SCALE_ORDER_22 重排后调用 update
+     */
+    fun updateByAddress(scales: List<ScaleData>) {
+        update(scales)
+    }
+
+    private fun stateStr(state: Int) = when (state) {
+        WeightUtil.STATE_STABLE      -> "稳定"
+        WeightUtil.STATE_UNSTABLE    -> "不稳定"
+        WeightUtil.STATE_OVER_WEIGHT -> "超量"
+        else -> ""
+    }
+}
@@ -1,134 +0,0 @@
-//package com.shuwei.dish.match.adapter
-//
-//import android.annotation.SuppressLint
-//import android.widget.TextView
-//import androidx.recyclerview.widget.GridLayoutManager
-//import androidx.recyclerview.widget.RecyclerView
-//import com.shuwei.dish.match.base.BaseActivity
-//import com.shuwei.dish.match.dialog.BottomDialog2
-//import com.shuwei.dish.match.entity.SeasoningEntity
-//import com.shuwei.dish.match.ui.DeviceSettingActivity
-//import com.shuwei.dish.match.ui.SubmitDishActivity
-//import com.shuwei.dish.match.utils.DataUtil
-//
-//object SeasoningCellTool {
-//    private val TAG = "SeasoningCellTool"
-//
-//    private val list = mutableListOf<SeasoningEntity>()
-//    private lateinit var activity: BaseActivity
-//    private var pageType: Int = 0
-//
-//    @SuppressLint("StaticFieldLeak")
-//    private lateinit var cellAdapter: TextCellAdapter
-//
-//    @SuppressLint("NotifyDataSetChanged")
-//    fun loadData(
-//        activity: BaseActivity,
-//        initList: MutableList<SeasoningEntity>? = null,
-//        recyclerView: RecyclerView,
-//        tvCell: TextView,
-//        pageType: Int = 0
-//    ) {
-//        this.activity = activity
-//        this.pageType = pageType
-//        list.clear()
-//        val tempList = buildData(initList, pageType)
-//        list.addAll(tempList)
-//        recyclerView.run {
-//            if (adapter == null) {
-//                layoutManager = GridLayoutManager(
-//                    activity,
-//                    3,
-//                    GridLayoutManager.VERTICAL,
-//                    false
-//                )
-//                cellAdapter = TextCellAdapter(list).apply {
-//                    onCellClick = { position ->
-//                        val currentAddress = DataUtil.getWeighAddressArray().get(position)
-//                        BottomDialog2(
-//                            weighIndex = position,
-//                            weighAddress = currentAddress,
-//                            clickName = list[position].goodsName
-//                        ).show(activity) { item ->
-//                            list[position].let { current ->
-//                                syncItem(current, item)
-//                                //3-调料
-//                                current.materialType = 3
-//                                current.sort = position
-//                            }
-//                            notifyItemChanged(position)
-//                            if (position == 14) {
-//                                syncItem(list[10], list[14])
-//                                syncItem(list[11], list[14])
-//                                syncItem(list[13], list[14])
-//                                TextCellAdapter.loadCell(tvCell, list[14])
-//                                notifyItemChanged(10)
-//                                notifyItemChanged(11)
-//                                notifyItemChanged(13)
-//                                notifyItemChanged(14)
-//                            }
-//                            if (activity is DeviceSettingActivity) {
-//                                //activity.list = list
-//                                activity.saveSeasoning(list[position])
-//                            }
-//                        }
-//                    }
-//                }
-//                adapter = cellAdapter
-//            } else {
-//                cellAdapter.notifyDataSetChanged()
-//            }
-//            if (activity is SubmitDishActivity) {
-//                activity.updateSeasoningList(list)
-//            }
-//        }
-//        if (pageType == 1) {
-//            tvCell.setOnClickListener {
-//                cellAdapter.onCellClick?.invoke(14)
-//            }
-//        }
-//        TextCellAdapter.loadCell(tvCell, list[list.size - 1])
-//    }
-//
-//    private fun buildData(
-//        initList: MutableList<SeasoningEntity>?,
-//        pageType: Int = 0
-//    ): MutableList<SeasoningEntity> {
-//        val list = mutableListOf<SeasoningEntity>()
-//        repeat(15) {
-//            list.add(SeasoningEntity().apply { this.pageType = pageType })
-//        }
-//        if (initList.isNullOrEmpty().not()) {
-//            initList.forEach {
-//                if (it.sort < list.size) {
-//                    list[it.sort] = it.apply { this.pageType = pageType }
-//                }
-//            }
-//            var lastItem = initList.firstOrNull { it.sort == 14 }
-//            lastItem = lastItem ?: list[list.size - 1]
-//            list[10] = lastItem
-//            list[11] = lastItem
-//            list[13] = lastItem
-//        }
-//        return list
-//    }
-//
-//    private fun syncItem(item: SeasoningEntity, newItem: SeasoningEntity) {
-//        item.run {
-//            goodsId = newItem.goodsId
-//            goodsName = newItem.goodsName
-//            goodsOrRelationCode = newItem.goodsOrRelationCode
-//            relateionType = newItem.relateionType
-//            materialType = newItem.materialType
-//            allEdible = newItem.allEdible
-//            useWeight = newItem.useWeight
-//            popularName = newItem.popularName
-//            canteenId = newItem.canteenId
-//            relateionType_dictText = newItem.relateionType_dictText
-//
-//            foodId = newItem.foodId
-//            sort = newItem.sort
-//        }
-//    }
-//
-//}
@@ -0,0 +1,58 @@
+package com.shuwei.dish.match.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.chad.library.adapter4.BaseQuickAdapter
+import com.chad.library.adapter4.viewholder.QuickViewHolder
+import com.shuwei.dish.match.databinding.ItemSeasoningWeightBinding
+
+/**
+ * 调料使用重量列表 Adapter
+ * 用于 SubmitFoodActivity 展示各调料槽位的实时用量
+ * 同名调料已在外部聚合，adapter 按 goodsName 作为唯一标识
+ */
+class SeasoningWeightAdapter : BaseQuickAdapter<SeasoningWeightAdapter.Item, SeasoningWeightAdapter.VH>() {
+
+    /** 调料展示数据项，key = goodsName（同名调料已聚合） */
+    data class Item(
+        val goodsId: String,
+        val goodsName: String,
+        /** 使用重量（克），同名调料已累加 */
+        val useWeight: Double
+    )
+
+    /**
+     * 更新单个 item，按 goodsName 匹配；不存在则追加
+     */
+    fun updateItem(item: Item) {
+        val idx = items.indexOfFirst { it.goodsName == item.goodsName }
+        if (idx >= 0) {
+            set(idx, item)
+        } else {
+            add(item)
+        }
+    }
+
+    /**
+     * 移除指定 goodsName 的 item（聚合后用量不足阈值时调用）
+     */
+    fun removeItem(goodsName: String) {
+        val idx = items.indexOfFirst { it.goodsName == goodsName }
+        if (idx >= 0) removeAt(idx)
+    }
+
+    override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
+        val binding = ItemSeasoningWeightBinding.inflate(LayoutInflater.from(context), parent, false)
+        return VH(binding)
+    }
+
+    override fun onBindViewHolder(holder: VH, position: Int, item: Item?) {
+        item ?: return
+        holder.binding.tvSeasoningName.text = item.goodsName
+        holder.binding.tvSeasoningWeight.text = "${item.useWeight}g"
+    }
+
+    inner class VH(var binding: ItemSeasoningWeightBinding) : QuickViewHolder(binding.root)
+
+}
@@ -1,10 +1,10 @@
 package com.shuwei.dish.match.base

 import android.content.Intent
+import android.content.pm.ActivityInfo
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
-import android.util.Log
 import android.view.View
 import android.widget.FrameLayout
 import android.widget.ImageView
@@ -12,58 +12,50 @@ import android.widget.TextView
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowInsetsControllerCompat
 import com.shuwei.dish.match.R
 import com.shuwei.dish.match.databinding.ActivityBaseBinding
 import com.shuwei.dish.match.dialog.Loading
-import com.shuwei.dish.match.http.HttpUtil
-import com.shuwei.dish.match.http.UrlConfig
-import com.shuwei.dish.match.ui.HomeActivity.Companion.TAG
+import com.shuwei.dish.match.net.NetViewModel
+import com.shuwei.dish.match.db.DbViewModel
 import com.shuwei.dish.match.ui.InitActivity
 import com.shuwei.dish.match.utils.ActivityManager
+import com.shuwei.dish.match.utils.ext.dp
 import com.shuwei.dish.match.utils.ext.gone
 import com.shuwei.dish.match.utils.ext.invisible
-import com.shuwei.dish.match.utils.ext.put
-import com.shuwei.dish.match.utils.ext.toast
 import com.shuwei.dish.match.utils.ext.visible
 import java.time.LocalDateTime
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import java.util.Locale
+import kotlin.getValue

@Suppress("DEPRECATION")
 open class BaseActivity : AppCompatActivity() {

    private lateinit var binding: ActivityBaseBinding
-    private var launcher: ActivityResultLauncher<Intent>? = null
-    private var launchCallback: ((Intent?) -> Unit)? = null
-
-    public fun launch(cls: Class<*>, launchCallback: (Intent?) -> Unit) {
-        this.launchCallback = launchCallback
-        launcher?.launch(Intent(this, cls))
-    }
-
-    public fun launch(intent: Intent, launchCallback: (Intent?) -> Unit) {
-        this.launchCallback = launchCallback
-        launcher?.launch(intent)
-    }

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
+        // 提前隐藏系统栏，避免窗口创建时导航栏闪烁
+        hideSystemBars()
+        // 主设备竖屏，子设备横屏
+        requestedOrientation = if (GlobalData.deviceRole == DeviceRole.MASTER)
+            ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+        else
+            ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
        ActivityManager.addActivity(this)
        binding = ActivityBaseBinding.inflate(layoutInflater)
-        if (this !is InitActivity) {
+        if (this !is InitActivity || GlobalData.deviceRole == DeviceRole.SLAVE) {
            binding.root.setBackgroundColor(ContextCompat.getColor(this, R.color.bg_color))
        }
        setContentView(binding.root)
        statusBarDarkFont(enable = false)
-        launcher =
-            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-                if (result.resultCode == RESULT_OK) {
-                    launchCallback?.invoke(result.data)
-                }
-            }

 //        window.setDecorFitsSystemWindows(false) // 启用 Edge-to-Edge
 //        window.insetsController?.apply {
@@ -71,6 +63,10 @@ open class BaseActivity : AppCompatActivity() {
 //            systemBarsBehavior =
 //                WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE // 滑动时临时显示
 //        }
+        // 主设备垂直 padding 30dp，子设备 15dp
+        val verticalPadding = if (GlobalData.deviceRole == DeviceRole.MASTER) 30.dp else 10.dp
+        binding.tvLeftTime.setPadding(0, verticalPadding, 0, verticalPadding)
+        binding.tvRightTime.setPadding(0, verticalPadding, 0, verticalPadding)
        binding.llTitleBar.gone()
        binding.ivBack.setOnClickListener { finish() }
    }
@@ -87,16 +83,17 @@ open class BaseActivity : AppCompatActivity() {
    }

    fun hideStatusBar() {
-        enableEdgeToEdge()
-//        val uiOptions = (View.SYSTEM_UI_FLAG_FULLSCREEN // 隐藏状态栏
-//                or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) // 隐藏导航栏（可选）
-        window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_FULLSCREEN
+//        enableEdgeToEdge()
+////        val uiOptions = (View.SYSTEM_UI_FLAG_FULLSCREEN // 隐藏状态栏
+////                or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) // 隐藏导航栏（可选）
+//        window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_FULLSCREEN
+        hideSystemBars()
    }

    fun statusBarDarkFont(enable: Boolean) {
        //window.decorView.systemUiVisibility = if (enable) View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR else 0
-        val color = ContextCompat.getColor(this,
-            if (enable) R.color.black else R.color.white
+        val color = ContextCompat.getColor(
+            this, if (enable) R.color.black else R.color.white
        )
        binding.tvLeftTime.setTextColor(color)
        binding.tvRightTime.setTextColor(color)
@@ -126,6 +123,9 @@ open class BaseActivity : AppCompatActivity() {
        )
    }

+    /** 返回 Fragment 容器的 View ID，供子类加载 Fragment 使用 */
+    protected fun getFragmentContainerId(): Int = R.id.flContainer
+
    override fun setContentView(view: View?) {
        if (view == binding.root) {
            super.setContentView(view)
@@ -142,7 +142,7 @@ open class BaseActivity : AppCompatActivity() {
        binding.tvLeftTime.text = arr[1]
    }

-    private val handler = Handler(Looper.getMainLooper())
+    val handler = Handler(Looper.getMainLooper())
    private val updateTask = object : Runnable {
        override fun run() {
            updateDateTime()
@@ -161,8 +161,11 @@ open class BaseActivity : AppCompatActivity() {
        handler.removeCallbacks(updateTask)
    }

-    fun showLoading() {
-        Loading.show(this)
+    fun showLoading(msg: String = "加载中……") {
+        Loading.show(
+            context = this,
+            message = msg
+        )
    }

    fun dismissLoading() {
@@ -176,5 +179,88 @@ open class BaseActivity : AppCompatActivity() {
    }


+    val netViewModel: NetViewModel by viewModels()
+    val appViewModel: DbViewModel by viewModels()
+
+    private var permissionCallback: ((isGranted: Boolean) -> Unit)? = null
+    private var activityCallback: ((intent: Intent?) -> Unit)? = null
+
+    fun requestMultiplePermissions(
+        permissions: Array<String>,
+        callback: (isGranted: Boolean) -> Unit
+    ) {
+        this.permissionCallback = callback
+        requestMultiplePermissionsLauncher.launch(permissions)
+    }
+
+    fun requestPermission(permission: String, callback: (isGranted: Boolean) -> Unit) {
+        this.permissionCallback = callback
+        requestPermissionLauncher.launch(permission)
+    }
+
+    val requestMultiplePermissionsLauncher = registerForActivityResult(
+        ActivityResultContracts.RequestMultiplePermissions()
+    ) { permissions ->
+        var isGranted = true
+        permissions.entries.forEach {
+            if (!it.value) {
+                isGranted = false
+            }
+        }
+        permissionCallback?.invoke(isGranted)
+    }
+
+    // 权限请求回调
+    val requestPermissionLauncher = registerForActivityResult(
+        ActivityResultContracts.RequestPermission()
+    ) { isGranted ->
+        permissionCallback?.invoke(isGranted)
+    }
+
+    fun startActivity(intent: Intent, callback: (Intent?) -> Unit) {
+        this.activityCallback = callback
+        startActivityLauncher.launch(intent)
+    }
+
+    // activity页面返回的回调
+    private val startActivityLauncher = registerForActivityResult(
+        ActivityResultContracts.StartActivityForResult()
+    ) {
+        activityCallback?.invoke(it.data)
+    }
+
+
+    /**
+     * 窗口焦点变化时回调
+     * 场景：弹出 Dialog 后焦点丢失，Dialog 消失后焦点恢复，此时需重新隐藏系统栏，
+     * 避免系统栏在 Dialog 关闭后意外"复活"
+     */
+    override fun onWindowFocusChanged(hasFocus: Boolean) {
+        super.onWindowFocusChanged(hasFocus)
+        if (hasFocus) {
+            hideSystemBars()
+        }
+    }
+
+    /**
+     * 隐藏状态栏和导航栏
+     * 使用 WindowInsetsControllerCompat（Androidx 推荐方式，向下兼容性好）
+     * - setDecorFitsSystemWindows 只在首次调用时设置，避免反复触发布局重绘
+     *   （重绘会导致 RecyclerView 滑动时抛出 "view is not a child, cannot hide" 异常）
+     * - 每次调用仍重新执行 hide()，保证系统栏在滑出后能被重新隐藏
+     */
+    private var systemBarsConfigured = false
+    private fun hideSystemBars() {
+        if (!systemBarsConfigured) {
+            // 只执行一次：允许布局延伸到系统栏区域
+            WindowCompat.setDecorFitsSystemWindows(window, false)
+            systemBarsConfigured = true
+        }
+        WindowInsetsControllerCompat(window, window.decorView).apply {
+            hide(WindowInsetsCompat.Type.systemBars())
+            systemBarsBehavior =
+                WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+        }
+    }

 }
@@ -5,9 +5,16 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.SharedPreferences
+import android.util.Log
 import com.shuwei.dish.match.R
 import com.shuwei.dish.match.db.DatabaseProvider
+import com.shuwei.dish.match.objbox.ObjectBox
+import com.shuwei.dish.match.scale.ScaleServiceManager
+import com.shuwei.dish.match.ui.InitActivity.Companion.TAG
+import com.shuwei.dish.match.utils.AppUtil
 import com.shuwei.dish.match.utils.BootReceiver
+import com.shuwei.dish.match.utils.CrashHandler
+import com.shuwei.dish.match.utils.Weigher2


 class BaseApp : Application() {
@@ -17,19 +24,38 @@ class BaseApp : Application() {
    override fun onCreate() {
        super.onCreate()
        instance = this
+        CrashHandler.init(this)
+        val deviceId = AppUtil.getUDID(this)
+        Log.d(TAG, "onCreate: deviceId=$deviceId")
+        GlobalData.deviceId = deviceId

+        // 根据设备 ID 判断角色：指定 ID 为主设备，其余为子设备
+        // 主设备是/dev/ttyS7，子设备是/dev/ttyS4
+        if (deviceId == "8fc2ab34-2137-3112-acca-f884ea8736d4") {
+            GlobalData.deviceRole = DeviceRole.MASTER
+            Weigher2.setDevicePort("/dev/ttyS7")
+        } else {
+            GlobalData.deviceRole = DeviceRole.SLAVE
+            Weigher2.setDevicePort("/dev/ttyS4")
+        }
+        Log.d(TAG, "设备角色: ${GlobalData.deviceRole}")
+
+        // 启动秤服务（主设备多启动发现+聚合，子设备只启动服务端+注册）
+        ScaleServiceManager.start(this)
+//        GlobalData.deviceId = "39a7abdd06b3c7ab"
        val filter = IntentFilter(Intent.ACTION_BOOT_COMPLETED)
        registerReceiver(BootReceiver(), filter)
+        ObjectBox.init(this)
    }

    companion object {

 //        const val canteenId = "1678234139391512577"
        var canteenId = "0"
-        var configUrl = ""
+//        var configUrl = ""

-        var token: String? = null
-        var deviceId: String? = null
+//        var token: String? = null
+//        var deviceId: String? = null
        var appVersion: String = "1"
        @Volatile
        private var sharedPref: SharedPreferences? = null
@@ -18,8 +18,16 @@ abstract class BaseFragment<VB : ViewBinding> : Fragment() {

    abstract fun inflateBinding(inflater: LayoutInflater, container: ViewGroup?): VB

+    abstract fun initialize()
+
    override fun onDestroyView() {
        super.onDestroyView()
        _binding = null
    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initialize()
+    }
+
 }
@@ -0,0 +1,40 @@
+package com.shuwei.dish.match.base
+
+/**
+ * 设备角色枚举
+ * MASTER：主设备，负责汇聚所有设备的秤数据并展示大屏界面
+ * SLAVE：子设备，负责推送本机秤数据给主设备
+ */
+enum class DeviceRole { MASTER, SLAVE }
+
+object GlobalData {
+    var appBaseUrl: String = TEST_BASE_URL
+
+    /**
+     * 具体业务 BaseUrl
+     */
+    const val TEST_BASE_URL = "http://192.168.1.201:14801"
+    const val UAT_BASE_URL = "https://dev.yixiong-tech.com:8081"
+    const val PROD_BASE_URL = "https://api.dm.yixiong-tech.com:8443"
+    /**
+     * 设备id
+     */
+    var deviceId: String = ""
+
+    /**
+     * 当前设备角色，启动时从 SpTool 读取，默认为 SLAVE
+     */
+    var deviceRole: DeviceRole = DeviceRole.SLAVE
+    var appId = "Hkz1rBk6PZXbS8KwKr67K2eZtsz8bRoMHLg64bUdgCZj"
+    var sdkKey = "AabXs3sHM8UhhE7oCGf4LVMLrdkGb1nJNksbjjTdVt7k"
+}
+
+/**
+ *
+ */
+object GlobalKey {
+    const val KEY_EQUIPMENT_INFO = "equipmentInfo"
+    const val KEY_TOKEN = "tokenKey"
+    const val KEY_USER_INFO = "userInfoKey"
+    const val KEY_USER_NAME = "userNameKey"
+}
@@ -6,10 +6,14 @@ import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
-import com.shuwei.dish.match.db.dao.AppDao
+import com.shuwei.dish.match.db.dao.CookFoodDao
+import com.shuwei.dish.match.db.dao.CookFoodGoodsDao
+import com.shuwei.dish.match.db.dao.SeasoningDao
+import com.shuwei.dish.match.db.dao.SeasoningSlotDao
 import com.shuwei.dish.match.entity.CookFoodEntity
 import com.shuwei.dish.match.entity.CookFoodGoodsEntity
 import com.shuwei.dish.match.entity.SeasoningEntity
+import com.shuwei.dish.match.entity.SeasoningSlotEntity


 // 步骤1：更新版本号
@@ -19,16 +23,20 @@ import com.shuwei.dish.match.entity.SeasoningEntity
        SeasoningEntity::class,
        CookFoodEntity::class,
        CookFoodGoodsEntity::class,
+        SeasoningSlotEntity::class,
    ],
-    version = 7,
+    version = 8,
    exportSchema = true
 )
 abstract class AppDatabase : RoomDatabase() {
-//    abstract fun seasoningDao(): SeasoningDao
-//    abstract fun cookFoodDao(): CookFoodDao
-//    abstract fun cookFoodGoodsDao(): CookFoodGoodsDao

-    abstract fun appDao(): AppDao
+    abstract fun cookFoodDao(): CookFoodDao
+
+    abstract fun cookFoodGoodsDao(): CookFoodGoodsDao
+
+    abstract fun seasoningDao(): SeasoningDao
+
+    abstract fun seasoningSlotDao(): SeasoningSlotDao

 }

@@ -140,6 +148,20 @@ val MIGRATION_5_6 = MigrationImpl(5, 6) { db ->
    db.endTransaction()
 }

+val MIGRATION_7_8 = MigrationImpl(7, 8) { db ->
+    db.execSQL(
+        """
+        CREATE TABLE IF NOT EXISTS `dm_seasoning_slot` (
+            `deviceId` TEXT NOT NULL,
+            `address` INTEGER NOT NULL,
+            `goodsId` TEXT NOT NULL,
+            `goodsName` TEXT NOT NULL,
+            PRIMARY KEY(`deviceId`, `address`)
+        )
+        """.trimIndent()
+    )
+}
+
 val MIGRATION_6_7 = MigrationImpl(6, 7) {db ->
    runCatching {

@@ -210,6 +232,7 @@ class DatabaseProvider(private val context: Context) {
 //            .addMigrations(MIGRATION_4_5)
 //            .addMigrations(MIGRATION_5_6)
 //            .addMigrations(MIGRATION_6_7)
+            .addMigrations(MIGRATION_7_8)
            .build()
    }
 }
@@ -1,109 +1,158 @@
 package com.shuwei.dish.match.db

 import com.shuwei.dish.match.base.BaseApp
-import com.shuwei.dish.match.db.dao.AppDao
 import com.shuwei.dish.match.entity.CookFoodEntity
 import com.shuwei.dish.match.entity.CookFoodGoodsEntity
 import com.shuwei.dish.match.entity.SeasoningEntity
+import com.shuwei.dish.match.entity.SeasoningSlotEntity
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext


-class AppRepository(val appDao: AppDao) {
+class DbRepository {
+
+    private val db = BaseApp.instance!!.database

    suspend fun insertCookFood(item: CookFoodEntity) = withContext(Dispatchers.IO) {
-        appDao.insertCookFood(item)
+        db.cookFoodDao().insertCookFood(item)
    }

    suspend fun updateCookFood(item: CookFoodEntity) = withContext(Dispatchers.IO) {
-        appDao.updateCookFood(item)
+        db.cookFoodDao().updateCookFood(item)
    }

    suspend fun getCookFoodById(foodId: String, cookMode: Int) = withContext(Dispatchers.IO) {
-        appDao.getCookFoodById(BaseApp.canteenId, foodId, cookMode)
+        db.cookFoodDao().getCookFoodById(BaseApp.canteenId, foodId, cookMode)
    }

    suspend fun getCookFoodList(cookMode: Int, dinnerType: String) = withContext(Dispatchers.IO) {
-        appDao.getCookFoodList(BaseApp.canteenId, cookMode, dinnerType)
+        db.cookFoodDao().getCookFoodList(BaseApp.canteenId, cookMode, dinnerType)
    }

    suspend fun countCookFood(cookMode: Int) = withContext(Dispatchers.IO) {
-        appDao.countCookFood(BaseApp.canteenId, cookMode)
+        db.cookFoodDao().countCookFood(BaseApp.canteenId, cookMode)
    }

    suspend fun deleteCookFood(foodId: String, cookMode: Int) = withContext(Dispatchers.IO) {
-        appDao.deleteCookFood(BaseApp.canteenId, foodId, cookMode)
+        db.cookFoodDao().deleteCookFood(BaseApp.canteenId, foodId, cookMode)
    }

    suspend fun deleteCookFoodGoodsList(pid: Long, foodId: String) = withContext(Dispatchers.IO) {
-        appDao.deleteCookFoodGoodsList(pid, foodId)
+        db.cookFoodGoodsDao().deleteCookFoodGoodsList(pid, foodId)
    }
    //--------------------------------------------------------------------------------------------

-//    suspend fun insertGoods(item: CookFoodGoodsEntity) = withContext(Dispatchers.IO) {
-//        appDao.insertGoods(item)
-//    }
-
    suspend fun insertGoodsList(items: MutableList<CookFoodGoodsEntity>) =
        withContext(Dispatchers.IO) {
-            appDao.insertGoodsList(items)
+            db.cookFoodGoodsDao().insertGoodsList(items)
        }

-//    suspend fun updateGoods(item: CookFoodGoodsEntity) = withContext(Dispatchers.IO) {
-//        appDao.updateGoods(item)
-//    }
-
    suspend fun getCookFoodGoodsList(pid: Long, foodId: String) = withContext(Dispatchers.IO) {
-        appDao.getCookFoodGoodsList(pid, foodId)
+        db.cookFoodGoodsDao().getCookFoodGoodsList(pid, foodId)
    }

    suspend fun getCookFoodGoodsListByType(
        foodId: String,
        materialType: Int
    ) = withContext(Dispatchers.IO) {
-        appDao.getCookFoodGoodsListByType(foodId, materialType)
+        db.cookFoodGoodsDao().getCookFoodGoodsListByType(foodId, materialType)
    }
    //--------------------------------------------------------------------------------------------

    suspend fun getSeasoningById(id: Long) = withContext(Dispatchers.IO) {
-        appDao.getSeasoningById(id)
+        db.seasoningDao().getSeasoningById(id)
    }

    suspend fun getSeasoningBySort(sort: Int) = withContext(Dispatchers.IO) {
-        appDao.getSeasoningBySort(sort)
+        db.seasoningDao().getSeasoningBySort(sort)
    }

    suspend fun getSeasoningByGoodsId(goodsId: Int) = withContext(Dispatchers.IO) {
-        appDao.getSeasoningByGoodsId(goodsId)
+        db.seasoningDao().getSeasoningByGoodsId(goodsId)
    }

    suspend fun getAllStream() = withContext(Dispatchers.IO) {
-        appDao.getAllStream()
+        db.seasoningDao().getAllStream()
    }

    suspend fun search(query: String) = withContext(Dispatchers.IO) {
-        appDao.search(query)
+        db.seasoningDao().search(query)
    }

    suspend fun clearAllSeasoning() = withContext(Dispatchers.IO) {
-        appDao.clearAllSeasoning()
+        db.seasoningDao().clearAllSeasoning()
    }

    suspend fun deleteSeasoningBySort(sort: Int) = withContext(Dispatchers.IO) {
-        appDao.deleteSeasoningBySort(sort)
+        db.seasoningDao().deleteSeasoningBySort(sort)
    }

    suspend fun insertSeasoningList(items: MutableList<SeasoningEntity>) =
        withContext(Dispatchers.IO) {
-            appDao.insertSeasoningList(items)
+            db.seasoningDao().insertSeasoningList(items)
        }

    suspend fun updateSeasoning(item: SeasoningEntity) = withContext(Dispatchers.IO) {
-        appDao.updateSeasoning(item)
+        db.seasoningDao().updateSeasoning(item)
    }

    suspend fun insertSeasoning(item: SeasoningEntity) = withContext(Dispatchers.IO) {
-        appDao.insertSeasoning(item)
+        db.seasoningDao().insertSeasoning(item)
+    }
+
+    /**
+     * 查询指定设备是否已配置调料槽位
+     * @param deviceId 目标设备 ID
+     * @return true 表示已有配置，false 表示未配置
+     */
+    suspend fun hasSeasoningSlotConfig(deviceId: String) = withContext(Dispatchers.IO) {
+        db.seasoningSlotDao().queryByDeviceId(deviceId).isNotEmpty()
+    }
+
+    /**
+     * 查询所有设备的调料槽位配置
+     */
+    suspend fun getAllSeasoningSlots() = withContext(Dispatchers.IO) {
+        db.seasoningSlotDao().queryAll()
+    }
+
+    /**
+     * 查询指定设备的调料槽位配置
+     * @param deviceId 目标设备 ID
+     */
+    suspend fun getSeasoningSlotsByDeviceId(deviceId: String) = withContext(Dispatchers.IO) {
+        db.seasoningSlotDao().queryByDeviceId(deviceId)
+    }
+
+    /**
+     * 插入或更新单个调料槽位配置
+     */
+    suspend fun upsertSeasoningSlot(slot: SeasoningSlotEntity) = withContext(Dispatchers.IO) {
+        db.seasoningSlotDao().upsert(slot)
+    }
+
+    /**
+     * 批量插入或更新调料槽位配置
+     */
+    suspend fun upsertAllSeasoningSlots(slots: List<SeasoningSlotEntity>) = withContext(Dispatchers.IO) {
+        db.seasoningSlotDao().upsertAll(slots)
+    }
+
+    /**
+     * 删除指定设备的指定槽位配置
+     * @param deviceId 目标设备 ID
+     * @param address  秤硬件地址
+     */
+    suspend fun deleteSeasoningSlot(deviceId: String, address: Int) = withContext(Dispatchers.IO) {
+        db.seasoningSlotDao().deleteByDeviceIdAndAddress(deviceId, address)
+    }
+
+    /**
+     * 删除指定设备的全部槽位配置
+     * @param deviceId 目标设备 ID
+     */
+    suspend fun deleteAllSlotsByDeviceId(deviceId: String) = withContext(Dispatchers.IO) {
+        db.seasoningSlotDao().deleteAllByDeviceId(deviceId)
    }
 }
 //
@@ -0,0 +1,305 @@
+package com.shuwei.dish.match.db
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.shuwei.dish.match.entity.CollectedFoodItem
+import com.shuwei.dish.match.entity.CookFoodEntity
+import com.shuwei.dish.match.objbox.ObjectBox
+import com.shuwei.dish.match.entity.CookFoodGoodsEntity
+import com.shuwei.dish.match.entity.SeasoningEntity
+import com.shuwei.dish.match.entity.SeasoningSlotEntity
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+
+class DbViewModel : ViewModel() {
+
+    private val rep = DbRepository()
+
+    fun updateCookFood(entity: CookFoodEntity) {
+        viewModelScope.launch {
+            rep.updateCookFood(entity)
+        }
+    }
+
+    private val _cookFoodDetailState = MutableStateFlow<CookFoodEntity?>(null)
+    val cookFoodDetailState: StateFlow<CookFoodEntity?> = _cookFoodDetailState.asStateFlow()
+
+    fun getCookFoodById(foodId: String, cookMode: Int) {
+        viewModelScope.launch {
+            _cookFoodDetailState.value = rep.getCookFoodById(foodId, cookMode)
+        }
+    }
+
+    private val _cookFoodListState = MutableStateFlow<MutableList<CookFoodEntity>?>(null)
+    val cookFoodListState: StateFlow<MutableList<CookFoodEntity>?> = _cookFoodListState.asStateFlow()
+    fun resetCookFoodList() {
+        _cookFoodListState.value = null
+    }
+    fun getCookFoodList(
+        cookMode: Int,
+        dinnerType: String = "0"
+    ) {
+        viewModelScope.launch {
+            _cookFoodListState.value = rep.getCookFoodList(cookMode, dinnerType)
+        }
+    }
+
+    suspend fun countCookFood(cookMode: Int): Int {
+        return rep.countCookFood(cookMode)
+    }
+
+//    fun saveCookFood(cookMode: Int, entity: CookFoodEntity) {
+//        viewModelScope.launch {
+//            val data = rep.getCookFoodById(entity.foodId, cookMode)
+//            if (data == null) {
+//                rep.insertCookFood(entity)
+//                return@launch
+//            }
+//            rep.updateCookFood(entity)
+//        }
+//    }
+
+    suspend fun saveCookFoodAndGoods(
+        cookMode: Int,
+        entity: CookFoodEntity,
+        list: MutableList<CookFoodGoodsEntity>?
+    ) {
+        val data = rep.getCookFoodById(entity.foodId, cookMode)
+        if (data != null) {
+            // 存在数据先删除
+            rep.deleteCookFood(entity.foodId, cookMode)
+            rep.deleteCookFoodGoodsList(data.id, entity.foodId)
+        }
+        // 重新保存数据
+        rep.insertCookFood(entity)
+        val newData = rep.getCookFoodById(entity.foodId, cookMode)
+        list?.let { it ->
+            it.forEach { goods ->
+                goods.id = 0
+                goods.pid = newData?.id ?: 0
+            }
+            rep.insertGoodsList(it)
+        }
+    }
+
+    suspend fun deleteCookFoodAndGoods(cookMode: Int, foodId: String) {
+        val data = rep.getCookFoodById(foodId, cookMode)
+        if (data != null) {
+            rep.deleteCookFood(foodId = foodId, cookMode = cookMode)
+            rep.deleteCookFoodGoodsList(pid = data.id, foodId = foodId)
+        }
+    }
+
+    //--------------------------------------------------------------------------------------------------------
+
+    suspend fun getCookFoodGoodsList(
+        foodId: String,
+        cookMode: Int
+    ): MutableList<CookFoodGoodsEntity> {
+        val cookFood = rep.getCookFoodById(foodId, cookMode)
+        return if (cookFood != null) rep.getCookFoodGoodsList(pid = cookFood.id, foodId = cookFood.foodId)
+        else mutableListOf()
+    }
+
+//    fun updateGoods(entity: CookFoodGoodsEntity) {
+//        viewModelScope.launch {
+//            rep.updateGoods(entity)
+//        }
+//    }
+
+//    fun saveCookFoodGoods(list: MutableList<CookFoodGoodsEntity>) {
+//        viewModelScope.launch {
+//            val foodId = list[0].foodId
+//            val data: MutableList<CookFoodGoodsEntity>? =
+//                rep.getCookFoodGoodsList(foodId!!)
+//            if (data.isNullOrEmpty()) {
+//                rep.insertGoodsList(list)
+//                return@launch
+//            }
+//            val localDbSeasoningList = rep.getCookFoodGoodsListByType(foodId, 3)
+//            localDbSeasoningList.forEach {
+//                it.isDel = 1
+//                //更新本地调料数据为已删除的状态
+//                rep.updateGoods(it)
+//            }
+//            //筛选出调料数据保存，主辅材不会变更不需要再次处理
+//            val saveSeasoningList = list.filter { it.materialType == 3 }
+//            rep.insertGoodsList(saveSeasoningList.toMutableList())
+//        }
+//    }
+
+    //--------------------------------------------------------------------------------------------------------
+
+//    fun addSeasoning(list: MutableList<SeasoningEntity>, callback: () -> Unit) {
+//        viewModelScope.launch {
+//            rep.deleteBatch()
+//            rep.insertSeasoningList(items = list)
+//            callback()
+//        }
+//    }
+
+    private val loadSeasoningMutex = Mutex()
+
+    /**
+     * 本地调料列表状态流
+     */
+    private val _seasoningState = MutableStateFlow<MutableList<SeasoningEntity>>(mutableListOf())
+    val seasoningState: StateFlow<MutableList<SeasoningEntity>> = _seasoningState.asStateFlow()
+
+    fun loadSeasoning() {
+        if (loadSeasoningMutex.isLocked) return
+        viewModelScope.launch {
+            loadSeasoningMutex.withLock {
+                _seasoningState.value = rep.getAllStream()
+            }
+        }
+    }
+
+    /**
+     * 所有设备调料槽位配置的 UI 状态流
+     */
+    private val _seasoningSlotState = MutableStateFlow<List<SeasoningSlotEntity>>(emptyList())
+    val seasoningSlotState: StateFlow<List<SeasoningSlotEntity>> = _seasoningSlotState.asStateFlow()
+
+    /**
+     * 查询所有调料槽位配置，更新 seasoningSlotState 并返回结果
+     * 声明为 suspend，调用方可在同一协程中直接使用返回值，无需等待 StateFlow 更新
+     */
+    suspend fun loadSeasoningSlot(): List<SeasoningSlotEntity> {
+        val slots = rep.getAllSeasoningSlots()
+        _seasoningSlotState.value = slots
+        return slots
+    }
+
+    fun deleteSeasoningBySort(sort: Int) {
+        viewModelScope.launch {
+            rep.deleteSeasoningBySort(sort)
+        }
+    }
+
+    private val _clearAllSeasoningState = MutableStateFlow(false)
+    val clearAllSeasoningState: StateFlow<Boolean> = _clearAllSeasoningState.asStateFlow()
+
+    fun clearAllSeasoning() {
+        viewModelScope.launch {
+            rep.clearAllSeasoning()
+            _clearAllSeasoningState.value = true
+        }
+    }
+
+    private val _hasSeasoningSlotConfigState = MutableStateFlow(false)
+    val hasSeasoningSlotConfigState: StateFlow<Boolean> = _hasSeasoningSlotConfigState.asStateFlow()
+
+    /**
+     * 查询指定设备是否已配置调料槽位
+     * @param deviceId 目标设备 ID
+     */
+    fun hasSeasoningSlotConfig(deviceId: String) {
+        viewModelScope.launch {
+            _hasSeasoningSlotConfigState.value = rep.hasSeasoningSlotConfig(deviceId)
+        }
+    }
+
+    /**
+     * 查询指定设备的调料槽位配置
+     */
+    suspend fun getSeasoningSlotsByDeviceId(deviceId: String) =
+        rep.getSeasoningSlotsByDeviceId(deviceId)
+
+    /**
+     * 插入或更新单个调料槽位配置
+     */
+    suspend fun upsertSeasoningSlot(slot: SeasoningSlotEntity) =
+        rep.upsertSeasoningSlot(slot)
+
+    /**
+     * 批量插入或更新调料槽位配置
+     */
+    suspend fun upsertAllSeasoningSlots(slots: List<SeasoningSlotEntity>) =
+        rep.upsertAllSeasoningSlots(slots)
+
+    /**
+     * 删除指定设备的指定槽位配置
+     * @param deviceId 目标设备 ID
+     * @param address  秤硬件地址
+     */
+    suspend fun deleteSeasoningSlot(deviceId: String, address: Int) =
+        rep.deleteSeasoningSlot(deviceId, address)
+
+    /**
+     * 删除指定设备的全部槽位配置（子设备接收全量广播时先清空再写入）
+     * @param deviceId 目标设备 ID
+     */
+    suspend fun deleteAllSlotsByDeviceId(deviceId: String) =
+        rep.deleteAllSlotsByDeviceId(deviceId)
+
+//    fun updateAll(list: MutableList<SeasoningEntity>) {
+//        viewModelScope.launch {
+//            list.forEach {
+//                rep.updateSeasoning(it)
+//            }
+//        }
+//    }
+
+    fun saveSeasoning(entity: SeasoningEntity, block: () -> Unit) {
+        viewModelScope.launch {
+            val list = rep.getSeasoningBySort(entity.sort)
+            val size = list?.size?:0
+            if (size == 1) {
+                rep.updateSeasoning(entity.also { it.id = list!![0].id })
+                block()
+                return@launch
+            }
+            if (size > 1) {
+                list?.forEach {
+                    rep.deleteSeasoningBySort(it.sort)
+                }
+            }
+            entity.id = 0
+            val id = rep.insertSeasoning(entity)
+            entity.id = id
+            block()
+        }
+    }
+
+    //--------------------------------------------------------------------------------------------------------
+
+    /**
+     * 已采集食材列表 UI 状态流
+     * 元素为按名称分组后的（名称，数量）数据
+     */
+    private val _collectedFoodListState = MutableStateFlow<List<CollectedFoodItem>>(emptyList())
+    val collectedFoodListState: StateFlow<List<CollectedFoodItem>> = _collectedFoodListState.asStateFlow()
+
+    /**
+     * 加载已采集食材列表，按名称分组统计数量
+     * 使用属性查询只读 name 字段，不加载 foodVector，节省内存
+     * @param nameFilter 名称过滤关键词，为空时加载全部
+     */
+    fun loadCollectedFoodList(nameFilter: String? = null) {
+        viewModelScope.launch {
+            val result = ObjectBox.queryFoodNameCounts(nameFilter)
+            _collectedFoodListState.value = result.map { (name, count) ->
+                CollectedFoodItem(foodName = name, collectCount = count)
+            }
+        }
+    }
+
+    /**
+     * 删除指定名称的所有采集记录，删除完成后刷新列表
+     * @param foodName 食材名称
+     * @param nameFilter 当前搜索关键词，用于删除后刷新列表
+     */
+    fun removeCollectedFood(foodName: String, nameFilter: String? = null) {
+        viewModelScope.launch {
+            ObjectBox.remove(foodName)
+            loadCollectedFoodList(nameFilter)
+        }
+    }
+
+    //--------------------------------------------------------------------------------------------------------
+}
@@ -1,92 +0,0 @@
-package com.shuwei.dish.match.db.dao
-
-import androidx.room.Dao
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-import androidx.room.Update
-import com.shuwei.dish.match.entity.CookFoodEntity
-import com.shuwei.dish.match.entity.CookFoodGoodsEntity
-import com.shuwei.dish.match.entity.SeasoningEntity
-import kotlinx.coroutines.flow.Flow
-
-@Dao
-interface AppDao {
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertCookFood(item: CookFoodEntity): Long
-
-    @Update
-    suspend fun updateCookFood(item: CookFoodEntity)
-
-    @Query("SELECT * FROM dm_cook_food WHERE isDel = 0 AND canteenId = :canteenId AND foodId = :foodId AND cookMode = :cookMode")
-    suspend fun getCookFoodById(canteenId:String, foodId: String, cookMode: Int): CookFoodEntity?
-
-    @Query("SELECT * FROM dm_cook_food WHERE isDel = 0 AND canteenId = :canteenId AND cookMode = :cookMode AND dinnerType = :dinnerType ORDER BY createTime DESC")
-    suspend fun getCookFoodList(canteenId:String, cookMode: Int, dinnerType:String): MutableList<CookFoodEntity>?
-
-    @Query("SELECT count(1) FROM dm_cook_food WHERE isDel = 0 AND canteenId = :canteenId AND cookMode = :cookMode")
-    suspend fun countCookFood(canteenId:String, cookMode: Int): Int
-
-    @Query("DELETE FROM dm_cook_food WHERE canteenId = :canteenId AND foodId = :foodId AND cookMode = :cookMode")
-    suspend fun deleteCookFood(canteenId:String, foodId: String, cookMode: Int)
-
-    //--------------------------------------------------------------------------------------------
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertGoods(item: CookFoodGoodsEntity): Long
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertGoodsList(items: MutableList<CookFoodGoodsEntity>): Array<Long>
-
-    @Update
-    suspend fun updateGoods(item: CookFoodGoodsEntity)
-
-    @Query("SELECT * FROM dm_cook_food_goods WHERE isDel = 0 AND pid = :pid AND foodId = :foodId")
-    suspend fun getCookFoodGoodsList(pid:Long, foodId: String): MutableList<CookFoodGoodsEntity>
-
-    @Query("SELECT * FROM dm_cook_food_goods WHERE isDel = 0 AND foodId = :foodId AND materialType = :materialType")
-    suspend fun getCookFoodGoodsListByType(
-        foodId: String,
-        materialType: Int
-    ): MutableList<CookFoodGoodsEntity>
-
-    @Query("DELETE FROM dm_cook_food_goods WHERE pid = :pid AND foodId = :foodId")
-    suspend fun deleteCookFoodGoodsList(pid:Long, foodId: String)
-
-    //--------------------------------------------------------------------------------------------
-
-    @Query("SELECT * FROM dm_seasoning WHERE isDel = 0 AND id = :id")
-    suspend fun getSeasoningById(id: Long): SeasoningEntity?
-
-    @Query("SELECT * FROM dm_seasoning WHERE isDel = 0 AND sort = :sort")
-    suspend fun getSeasoningBySort(sort: Int): MutableList<SeasoningEntity>?
-
-    @Query("SELECT * FROM dm_seasoning WHERE isDel = 0 AND goodsId = :goodsId")
-    suspend fun getSeasoningByGoodsId(goodsId: Int): SeasoningEntity?
-
-//    @Query("SELECT * FROM dm_seasoning WHERE isDel = 0 AND goodsId != -1 AND goodsName != '' ORDER BY sort ASC")
-//    fun getAllStream(): Flow<MutableList<SeasoningEntity>>
-
-    @Query("SELECT * FROM dm_seasoning WHERE isDel = 0 AND goodsId != -1 AND goodsName != '' ORDER BY sort ASC")
-    fun getAllStream(): MutableList<SeasoningEntity>
-
-    @Query("SELECT * FROM dm_seasoning WHERE isDel = 0 AND  goodsName LIKE '%' || :query || '%'")
-    suspend fun search(query: String): MutableList<SeasoningEntity>
-
-    @Query("DELETE FROM dm_seasoning WHERE isDel = 0 AND sort = :sort")
-    suspend fun deleteSeasoningBySort(sort:Int): Int
-
-    @Query("DELETE FROM dm_seasoning WHERE isDel = 0")
-    suspend fun clearAllSeasoning(): Int
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertSeasoningList(items: MutableList<SeasoningEntity>): Array<Long>
-
-    @Update
-    suspend fun updateSeasoning(item: SeasoningEntity)
-
-    @Insert
-    suspend fun insertSeasoning(item: SeasoningEntity): Long
-    //--------------------------------------------------------------------------------------------
-}
@@ -1,20 +1,30 @@
-//package com.shuwei.dish.match.db.dao
-//
-//import androidx.room.Dao
-//import androidx.room.Query
-//import com.shuwei.dish.match.db.BaseDao
-//import com.shuwei.dish.match.entity.CookFoodEntity
-//
-//@Dao
-//interface CookFoodDao : BaseDao<CookFoodEntity> {
-//
-//    @Query("SELECT * FROM dm_cook_food WHERE isDel = 0 AND foodId = :foodId AND cookMode = :cookMode")
-//    suspend fun getCookFoodById(foodId: String, cookMode:Int): CookFoodEntity?
-//
-//    @Query("SELECT * FROM dm_cook_food WHERE isDel = 0 AND cookMode = :cookMode")
-//    suspend fun getCookFoodList(cookMode:Int): MutableList<CookFoodEntity>?
-//
-//    @Query("SELECT count(1) FROM dm_cook_food WHERE isDel = 0 AND cookMode = :cookMode")
-//    suspend fun countCookFood(cookMode:Int): Int
-//
-//}
+package com.shuwei.dish.match.db.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Update
+import com.shuwei.dish.match.entity.CookFoodEntity
+
+@Dao
+interface CookFoodDao {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertCookFood(item: CookFoodEntity): Long
+
+    @Update
+    suspend fun updateCookFood(item: CookFoodEntity)
+
+    @Query("SELECT * FROM dm_cook_food WHERE isDel = 0 AND canteenId = :canteenId AND foodId = :foodId AND cookMode = :cookMode")
+    suspend fun getCookFoodById(canteenId: String, foodId: String, cookMode: Int): CookFoodEntity?
+
+    @Query("SELECT * FROM dm_cook_food WHERE isDel = 0 AND canteenId = :canteenId AND cookMode = :cookMode AND dinnerType = :dinnerType ORDER BY createTime DESC")
+    suspend fun getCookFoodList(canteenId: String, cookMode: Int, dinnerType: String): MutableList<CookFoodEntity>?
+
+    @Query("SELECT count(1) FROM dm_cook_food WHERE isDel = 0 AND canteenId = :canteenId AND cookMode = :cookMode")
+    suspend fun countCookFood(canteenId: String, cookMode: Int): Int
+
+    @Query("DELETE FROM dm_cook_food WHERE canteenId = :canteenId AND foodId = :foodId AND cookMode = :cookMode")
+    suspend fun deleteCookFood(canteenId: String, foodId: String, cookMode: Int)
+}
@@ -1,29 +1,30 @@
-//package com.shuwei.dish.match.db.dao
-//
-//import androidx.room.Dao
-//import androidx.room.Query
-//import com.shuwei.dish.match.db.BaseDao
-//import com.shuwei.dish.match.entity.CookFoodGoodsEntity
-//
-//@Dao
-//interface CookFoodGoodsDao : BaseDao<CookFoodGoodsEntity> {
-//
-//    @Query("SELECT * FROM dm_cook_food_goods WHERE isDel = 0 AND foodId = :foodId")
-//    suspend fun getCookFoodGoodsList(foodId: String): MutableList<CookFoodGoodsEntity>
-//
-//    @Query("SELECT * FROM dm_cook_food_goods WHERE isDel = 0 AND foodId = :foodId AND materialType = :materialType")
-//    suspend fun getCookFoodGoodsListByType(foodId: String, materialType:Int): MutableList<CookFoodGoodsEntity>
-//
-////    @Query(
-////        """
-////        UPDATE dm_cook_food_goods
-////        SET goodsName=:entity.goodsName, foodId=:entity.foodId, relateionType=:entity.relateionType, sort=:entity.sort
-////            allEdible=:entity.allEdible, useWeight=:entity.useWeight, isDel=:entity.isDel, createTime=:entity.createTime
-////        WHERE isDel = 0
-////        AND foodId=:entity.foodId
-////        AND goodsId=:goodsId
-////    """
-////    )
-////    fun updateByGoodsId(entity: CookFoodGoodsEntity)
-//
-//}
+package com.shuwei.dish.match.db.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Update
+import com.shuwei.dish.match.entity.CookFoodGoodsEntity
+
+@Dao
+interface CookFoodGoodsDao {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertGoods(item: CookFoodGoodsEntity): Long
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertGoodsList(items: MutableList<CookFoodGoodsEntity>): Array<Long>
+
+    @Update
+    suspend fun updateGoods(item: CookFoodGoodsEntity)
+
+    @Query("SELECT * FROM dm_cook_food_goods WHERE isDel = 0 AND pid = :pid AND foodId = :foodId")
+    suspend fun getCookFoodGoodsList(pid: Long, foodId: String): MutableList<CookFoodGoodsEntity>
+
+    @Query("SELECT * FROM dm_cook_food_goods WHERE isDel = 0 AND foodId = :foodId AND materialType = :materialType")
+    suspend fun getCookFoodGoodsListByType(foodId: String, materialType: Int): MutableList<CookFoodGoodsEntity>
+
+    @Query("DELETE FROM dm_cook_food_goods WHERE pid = :pid AND foodId = :foodId")
+    suspend fun deleteCookFoodGoodsList(pid: Long, foodId: String)
+}
@@ -1,25 +1,42 @@
-//package com.shuwei.dish.match.db.dao
-//
-//import androidx.room.Dao
-//import androidx.room.Query
-//import com.shuwei.dish.match.db.BaseDao
-//import com.shuwei.dish.match.entity.SeasoningEntity
-//import kotlinx.coroutines.flow.Flow
-//
-//@Dao
-//interface SeasoningDao : BaseDao<SeasoningEntity> {
-//
-////    @Query("SELECT * FROM dm_seasoning WHERE isDel = 0 AND id = :id")
-////    suspend fun getSeasoningById(id: Long): SeasoningEntity?
-////
-////    @Query("SELECT * FROM dm_seasoning WHERE isDel = 0 ORDER BY sort ASC")
-////    fun getAllStream(): Flow<MutableList<SeasoningEntity>>
-////
-////    @Query("SELECT * FROM dm_seasoning WHERE isDel = 0 AND  name LIKE '%' || :query || '%'")
-////    suspend fun search(query: String): MutableList<SeasoningEntity>
-////
-////    @Query("DELETE FROM dm_seasoning WHERE rowid IN " +
-////            "(SELECT rowid FROM dm_seasoning LIMIT 1000)")
-////    suspend fun deleteBatch(): Int
-//
-//}
+package com.shuwei.dish.match.db.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Update
+import com.shuwei.dish.match.entity.SeasoningEntity
+
+@Dao
+interface SeasoningDao {
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertSeasoning(item: SeasoningEntity): Long
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertSeasoningList(items: MutableList<SeasoningEntity>): Array<Long>
+
+    @Update
+    suspend fun updateSeasoning(item: SeasoningEntity)
+
+    @Query("SELECT * FROM dm_seasoning WHERE isDel = 0 AND id = :id")
+    suspend fun getSeasoningById(id: Long): SeasoningEntity?
+
+    @Query("SELECT * FROM dm_seasoning WHERE isDel = 0 AND sort = :sort")
+    suspend fun getSeasoningBySort(sort: Int): MutableList<SeasoningEntity>?
+
+    @Query("SELECT * FROM dm_seasoning WHERE isDel = 0 AND goodsId = :goodsId")
+    suspend fun getSeasoningByGoodsId(goodsId: Int): SeasoningEntity?
+
+    @Query("SELECT * FROM dm_seasoning WHERE isDel = 0 AND goodsId != -1 AND goodsName != '' ORDER BY sort ASC")
+    fun getAllStream(): MutableList<SeasoningEntity>
+
+    @Query("SELECT * FROM dm_seasoning WHERE isDel = 0 AND goodsName LIKE '%' || :query || '%'")
+    suspend fun search(query: String): MutableList<SeasoningEntity>
+
+    @Query("DELETE FROM dm_seasoning WHERE isDel = 0 AND sort = :sort")
+    suspend fun deleteSeasoningBySort(sort: Int): Int
+
+    @Query("DELETE FROM dm_seasoning WHERE isDel = 0")
+    suspend fun clearAllSeasoning(): Int
+}
@@ -0,0 +1,55 @@
+package com.shuwei.dish.match.db.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import com.shuwei.dish.match.entity.SeasoningSlotEntity
+
+/**
+ * 调料槽位配置 DAO
+ * 以 (deviceId, address) 为主键做 upsert，保证同一槽位只保留最新配置
+ */
+@Dao
+interface SeasoningSlotDao {
+
+    /**
+     * 插入或更新单个槽位配置（主键冲突时覆盖）
+     */
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun upsert(slot: SeasoningSlotEntity)
+
+    /**
+     * 批量插入或更新槽位配置（主设备广播全量时使用）
+     */
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun upsertAll(slots: List<SeasoningSlotEntity>)
+
+    /**
+     * 查询指定设备的全部槽位配置
+     * @param deviceId 目标设备 ID
+     */
+    @Query("SELECT * FROM dm_seasoning_slot WHERE deviceId = :deviceId")
+    suspend fun queryByDeviceId(deviceId: String): List<SeasoningSlotEntity>
+
+    /**
+     * 查询所有设备的全部槽位配置（主设备广播时使用）
+     */
+    @Query("SELECT * FROM dm_seasoning_slot")
+    suspend fun queryAll(): List<SeasoningSlotEntity>
+
+    /**
+     * 删除指定设备的指定槽位配置
+     * @param deviceId 目标设备 ID
+     * @param address  秤硬件地址
+     */
+    @Query("DELETE FROM dm_seasoning_slot WHERE deviceId = :deviceId AND address = :address")
+    suspend fun deleteByDeviceIdAndAddress(deviceId: String, address: Int)
+
+    /**
+     * 删除指定设备的全部槽位配置（子设备接收全量广播时先清空再写入）
+     * @param deviceId 目标设备 ID
+     */
+    @Query("DELETE FROM dm_seasoning_slot WHERE deviceId = :deviceId")
+    suspend fun deleteAllByDeviceId(deviceId: String)
+}
@@ -1,201 +0,0 @@
-package com.shuwei.dish.match.dialog
-
-import android.annotation.SuppressLint
-import android.os.Handler
-import android.os.Looper
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import androidx.core.view.isEmpty
-import androidx.core.widget.addTextChangedListener
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.shuwei.dish.match.R
-import com.shuwei.dish.match.adapter.GoodsInfoSearchAdapter
-import com.shuwei.dish.match.base.BaseActivity
-import com.shuwei.dish.match.base.BaseApp
-import com.shuwei.dish.match.databinding.DialogBottomSheetBinding
-import com.shuwei.dish.match.entity.CookFoodGoodsEntity
-import com.shuwei.dish.match.entity.GoodsRecordBean
-import com.shuwei.dish.match.http.HttpUtil
-import com.shuwei.dish.match.http.UrlConfig
-import com.shuwei.dish.match.utils.KeyboardUtil
-import com.shuwei.dish.match.utils.ext.addOnActionSearchListener
-import com.shuwei.dish.match.utils.ext.toJsonString
-import com.shuwei.dish.match.utils.ext.toObject
-import com.shuwei.dish.match.utils.ext.toast
-
-/**
- * @param goodsType 1-调料，0-食材
- */
-class BottomDialog(
-    private var goodsType: Int = 1,
-    private var defGoodsName:String? = null
-) {
-    companion object {
-        const val TAG = "BottomDialog"
-    }
-
-    private var list = mutableListOf<CookFoodGoodsEntity>()
-
-    private lateinit var binding: DialogBottomSheetBinding
-    private lateinit var goodsInfoSearchAdapter: GoodsInfoSearchAdapter
-    private var goodsName: String? = null
-
-    private var activity: BaseActivity? = null
-
-    fun show(activity: BaseActivity, callback: (item: CookFoodGoodsEntity) -> Unit) {
-        this.activity = activity
-        //直接使用BottomSheetDialog
-        var dialog: BottomSheetDialog? = null
-        val inflater = LayoutInflater.from(activity)
-        binding = DialogBottomSheetBinding.inflate(inflater)
-
-        binding.tvSheetName.text = if (goodsType == 1) "调料检索" else "食材检索"
-        binding.etSheetInput.hint = if (goodsType == 1) "输入调料名称" else "输入食材名称或速记码"
-        goodsInfoSearchAdapter = GoodsInfoSearchAdapter(list).apply {
-            setOnItemClickListener { _, _, position ->
-                list[position].isClicked = true
-                notifyItemChanged(position)
-                Handler(Looper.getMainLooper()).postDelayed({
-                    callback(list[position])
-                    dialog?.dismiss()
-                }, 300)
-            }
-        }
-        binding.recyclerView.run {
-            layoutManager = GridLayoutManager(activity, 2, GridLayoutManager.VERTICAL, false)
-            adapter = goodsInfoSearchAdapter
-            addOnScrollListener(object : RecyclerView.OnScrollListener() {
-                override fun onScrollStateChanged(rv: RecyclerView, newState: Int) {
-                    super.onScrollStateChanged(rv, newState);
-                }
-
-                override fun onScrolled(rv: RecyclerView, dx: Int, dy: Int) {
-                    //解决RecyclerView和smartRefreshLayout滑动冲突问题
-                    super.onScrolled(rv, dx, dy)
-                    val topRowVerticalPosition = if (rv.isEmpty()) 0 else rv.getChildAt(0).top
-                    binding.refreshLayout.setNestedScrollingEnabled(topRowVerticalPosition >= 0)
-                }
-            })
-        }
-        dialog = BottomSheetDialog(activity, R.style.BottomSheet).apply {
-            setContentView(binding.root)
-            setCancelable(true)
-            behavior.skipCollapsed = false // 跳过折叠状态
-//            behavior.peekHeight = 880.dp
-//            window?.setLayout(-1, 880.dp)
-            show()
-            setOnDismissListener {
-                activity.hideStatusBar()
-            }
-        }
-        binding.refreshLayout.setOnRefreshListener {
-            pageNo = 1
-            getGoodsList()
-        }
-
-        binding.refreshLayout.setOnLoadMoreListener {
-            getGoodsList()
-        }
-        binding.etSheetInput.addTextChangedListener(
-            onTextChanged = { text, start, before, count ->
-                goodsName = text.toString()
-            })
-        binding.ivSearch.setOnClickListener { v ->
-            searchGoods(v)
-        }
-        binding.root.setOnClickListener { v ->
-            KeyboardUtil.hideKeyboard(v.context, v)
-        }
-        binding.etSheetInput.let { v ->
-            v.addOnActionSearchListener {
-                searchGoods(v)
-            }
-        }
-        binding.refreshLayout.setEnableRefresh(false)
-        binding.refreshLayout.setEnableLoadMore(false)
-
-        if (defGoodsName.isNullOrBlank().not()) {
-            binding.etSheetInput.let {
-                it.setText(defGoodsName)
-                searchGoods(it)
-            }
-        }
-    }
-
-    private fun searchGoods(v: View) {
-        if (goodsName.isNullOrBlank()) {
-            activity?.toast("请${binding.etSheetInput.hint}")
-            return
-        }
-        pageNo = 1
-        getGoodsList()
-        KeyboardUtil.hideKeyboard(v.context, v)
-    }
-
-    private var pageNo = 1
-    private val pageSize = 120
-
-    /**
-     */
-    @SuppressLint("NotifyDataSetChanged")
-    private fun getGoodsList() {
-//        val pathSegmentList = UrlConfig.QUERY_GOODS_LIST.split(delimiters = arrayOf("/"), limit = 1)
-        val queryParams = mutableMapOf(
-            "goodsType" to "$goodsType",
-            "canteenId" to BaseApp.canteenId,
-            "pageNo" to "$pageNo",
-            "pageSize" to "$pageSize"
-        )
-        if (goodsName.isNullOrBlank().not()) {
-            queryParams.put("name", goodsName!!)
-        }
-        val sb = StringBuilder().apply {
-            append(UrlConfig.QUERY_GOODS_LIST)
-            append("?")
-            queryParams.forEach { (key, value) ->
-                append("$key=$value&")
-            }
-        }
-        sb.deleteCharAt(sb.length - 1)
-        Log.d(TAG, "getGoodsList: url = $sb")
-        HttpUtil.get(
-            url = sb.toString(),
-            doSuccess = {
-                val json = it.toJsonString()
-                Log.d(TAG, "getGoodsList: json=$json")
-                val recordBean: GoodsRecordBean? = json.toObject<GoodsRecordBean>()
-                if (recordBean == null || recordBean.records.isNullOrEmpty()) {
-                    activity?.toast(if (goodsType == 1) "暂未搜索到调料信息" else "暂未搜索到食材信息")
-                    return@get
-                }
-                val records = recordBean.records
-                if (pageNo == 1) {
-                    list.clear()
-                }
-                list.addAll(records!!)
-                goodsInfoSearchAdapter.notifyDataSetChanged()
-                if (pageNo == 1) {
-                    binding.refreshLayout.finishRefresh(1200)
-                } else {
-                    binding.refreshLayout.finishLoadMore(1200)
-                }
-                val isLoadMoreEnable = records.size >= pageSize
-                binding.refreshLayout.setEnableLoadMore(isLoadMoreEnable)
-                if (isLoadMoreEnable) {
-                    pageNo++
-                }
-            }, doFailure = { code, msg ->
-                activity?.toast(msg)
-                if (pageNo == 1) {
-                    binding.refreshLayout.finishRefresh(1200)
-                } else {
-                    binding.refreshLayout.finishLoadMore(1200)
-                }
-            })
-    }
-
-}
-
@@ -1,258 +0,0 @@
-package com.shuwei.dish.match.dialog
-
-import android.annotation.SuppressLint
-import android.graphics.Typeface
-import android.os.Handler
-import android.os.Looper
-import android.text.SpannableStringBuilder
-import android.text.style.AbsoluteSizeSpan
-import android.text.style.ForegroundColorSpan
-import android.text.style.LineHeightSpan
-import android.text.style.StyleSpan
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import androidx.core.graphics.toColorInt
-import androidx.core.view.isEmpty
-import androidx.core.widget.addTextChangedListener
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.shuwei.dish.match.R
-import com.shuwei.dish.match.adapter.SeasoningSearchAdapter
-import com.shuwei.dish.match.base.BaseActivity
-import com.shuwei.dish.match.base.BaseApp
-import com.shuwei.dish.match.databinding.DialogBottomSheet2Binding
-import com.shuwei.dish.match.entity.SeasoningEntity
-import com.shuwei.dish.match.entity.SeasoningRecordBean
-import com.shuwei.dish.match.http.HttpUtil
-import com.shuwei.dish.match.http.UrlConfig
-import com.shuwei.dish.match.utils.KeyboardUtil
-import com.shuwei.dish.match.utils.WeightUtil
-import com.shuwei.dish.match.utils.ext.addOnActionSearchListener
-import com.shuwei.dish.match.utils.ext.appendText
-import com.shuwei.dish.match.utils.ext.buildSpannableString
-import com.shuwei.dish.match.utils.ext.dp
-import com.shuwei.dish.match.utils.ext.roundedDecimalPlace
-import com.shuwei.dish.match.utils.ext.roundedOneDecimalPlace
-import com.shuwei.dish.match.utils.ext.toJsonString
-import com.shuwei.dish.match.utils.ext.toObject
-import com.shuwei.dish.match.utils.ext.toast
-
-/**
- * @param goodsType 1-调料，0-食材
- */
-class BottomDialog2(
-    private var weighIndex: Int,
-    private var weighAddress: Int,
-    private var clickName: String? = null
-) {
-    companion object {
-        const val TAG = "BottomDialog2"
-    }
-
-    private val goodsType: Int = 1
-    private var list = mutableListOf<SeasoningEntity>()
-
-    private lateinit var binding: DialogBottomSheet2Binding
-    private lateinit var searchAdapter: SeasoningSearchAdapter
-    private var goodsName: String? = null
-
-    private var activity: BaseActivity? = null
-
-    fun show(activity: BaseActivity, callback: (item: SeasoningEntity) -> Unit) {
-        this.activity = activity
-        //直接使用BottomSheetDialog
-        var dialog: BottomSheetDialog? = null
-        val inflater = LayoutInflater.from(activity)
-        binding = DialogBottomSheet2Binding.inflate(inflater)
-
-        //binding.tvSheetName.text = if (goodsType == 1) "调料检索" else "食材检索"
-        binding.etSheetInput.hint = if (goodsType == 1) "输入调料名称" else "输入食材名称或速记码"
-        searchAdapter = SeasoningSearchAdapter(list).apply {
-            setOnItemClickListener { _, _, position ->
-                list[position].isClicked = true
-                notifyItemChanged(position)
-                Handler(Looper.getMainLooper()).postDelayed({
-                    callback(list[position].also { it.useWeight = currentWeight })
-                    dialog?.dismiss()
-                }, 300)
-            }
-        }
-        binding.recyclerView.run {
-            layoutManager = GridLayoutManager(activity, 2, GridLayoutManager.VERTICAL, false)
-            adapter = searchAdapter
-            addOnScrollListener(object : RecyclerView.OnScrollListener() {
-                override fun onScrollStateChanged(rv: RecyclerView, newState: Int) {
-                    super.onScrollStateChanged(rv, newState);
-                }
-
-                override fun onScrolled(rv: RecyclerView, dx: Int, dy: Int) {
-                    //解决RecyclerView和smartRefreshLayout滑动冲突问题
-                    super.onScrolled(rv, dx, dy)
-                    val topRowVerticalPosition = if (rv.isEmpty()) 0 else rv.getChildAt(0).top
-                    binding.refreshLayout.setNestedScrollingEnabled(topRowVerticalPosition >= 0)
-                }
-            })
-        }
-        dialog = BottomSheetDialog(activity, R.style.BottomSheet).apply {
-            setContentView(binding.root)
-            setCancelable(true)
-            behavior.skipCollapsed = false // 跳过折叠状态
-//            behavior.peekHeight = 880.dp
-//            window?.setLayout(-1, 880.dp)
-            show()
-            setOnDismissListener {
-                activity.hideStatusBar()
-            }
-        }
-        binding.refreshLayout.setOnRefreshListener {
-            pageNo = 1
-            getGoodsList()
-        }
-
-        binding.refreshLayout.setOnLoadMoreListener {
-            getGoodsList()
-        }
-        binding.etSheetInput.addTextChangedListener(
-            onTextChanged = { text, start, before, count ->
-                goodsName = text.toString()
-            })
-        binding.ivSearch.setOnClickListener { v ->
-            searchGoods(v)
-        }
-        binding.root.setOnClickListener { v ->
-            KeyboardUtil.hideKeyboard(v.context, v)
-        }
-        binding.etSheetInput.let { v ->
-            v.addOnActionSearchListener {
-                searchGoods(v)
-            }
-        }
-        binding.refreshLayout.setEnableRefresh(false)
-        binding.tvClear.setOnClickListener {
-            Log.d(TAG, "show: weighAddress=$weighAddress")
-            WeightUtil.tareTwo(weighAddress)
-//            repeat(14) { num->
-//                Log.d(TAG, "show: num=$num")
-//                WeightUtil.tareTwo(num+1)
-//            }
-        }
-        WeightUtil.addWeightListener (
-            weightKey = TAG,
-            getWeight = { address, state, weight ->
-                if (weighAddress == address) {
-                    this.currentWeight = weight.toDouble()
-                    binding.tvWeight.text = getTextSpan(weight)
-                }
-            })
-        binding.tvWeight.text = getTextSpan(0.0)
-
-        if (clickName.isNullOrBlank().not()) {
-            binding.etSheetInput.setText(clickName!!.trim())
-            pageNo = 1
-            getGoodsList()
-        }
-    }
-
-    private fun searchGoods(v: View) {
-        if (goodsName.isNullOrBlank()) {
-            activity?.toast("请${binding.etSheetInput.hint}")
-            return
-        }
-        pageNo = 1
-        getGoodsList()
-        KeyboardUtil.hideKeyboard(v.context, v)
-    }
-
-    private var currentWeight = 0.toDouble()
-    private var pageNo = 1
-    private val pageSize = 120
-
-    /**
-     */
-    @SuppressLint("NotifyDataSetChanged")
-    private fun getGoodsList() {
-        val queryParams = mutableMapOf(
-            "goodsType" to "$goodsType",
-            "canteenId" to BaseApp.canteenId,
-            "pageNo" to "$pageNo",
-            "pageSize" to "$pageSize"
-        )
-        if (goodsName.isNullOrBlank().not()) {
-            queryParams.put("name", goodsName!!)
-        }
-        val sb = StringBuilder().apply {
-            append(UrlConfig.QUERY_GOODS_LIST)
-            append("?")
-            queryParams.forEach { (key, value) ->
-                append("$key=$value&")
-            }
-        }
-        sb.deleteCharAt(sb.length - 1)
-        Log.d(TAG, "getGoodsList: url = $sb")
-        HttpUtil.get(
-            url = sb.toString(),
-            doSuccess = {
-                val json = it.toJsonString()
-                Log.d(TAG, "getGoodsList: json=$json")
-                val recordBean: SeasoningRecordBean? = json.toObject<SeasoningRecordBean>()
-                if (recordBean == null || recordBean.records.isNullOrEmpty()) {
-                    activity?.toast(if (goodsType == 1) "暂未搜索到调料信息" else "暂未搜索到食材信息")
-                    return@get
-                }
-                val records = recordBean.records
-                if (pageNo == 1) {
-                    list.clear()
-                }
-                list.addAll(records!!)
-                searchAdapter.notifyDataSetChanged()
-                if (pageNo == 1) {
-                    binding.refreshLayout.finishRefresh(1200)
-                } else {
-                    binding.refreshLayout.finishLoadMore(1200)
-                }
-                val isLoadMoreEnable = records.size >= pageSize
-                binding.refreshLayout.setEnableLoadMore(isLoadMoreEnable)
-                if (isLoadMoreEnable) {
-                    pageNo++
-                }
-            }, doFailure = { code, msg ->
-                activity?.toast(msg)
-                if (pageNo == 1) {
-                    binding.refreshLayout.finishRefresh(1200)
-                } else {
-                    binding.refreshLayout.finishLoadMore(1200)
-                }
-            })
-    }
-
-    fun getTextSpan(weight: Double): SpannableStringBuilder {
-        var topWeight = "$weight"
-        var bottomUnit = "克"
-        if (weight >= 1000) {
-            topWeight = "${(weight/1000).roundedDecimalPlace(3)}"
-            bottomUnit = "千克"
-        }
-        return buildSpannableString {
-            appendText(
-                topWeight,
-                ForegroundColorSpan("#000000".toColorInt()),
-                StyleSpan(Typeface.BOLD),
-                AbsoluteSizeSpan(72, true),
-                LineHeightSpan { text, start, end, spanstartv, v, fm ->
-                    fm.descent += 10.dp // 增加行间距
-                }
-            )
-            append("\n")
-            appendText(
-                bottomUnit,
-                ForegroundColorSpan("#999999".toColorInt()),
-                AbsoluteSizeSpan(30, true)
-            )
-        }
-    }
-}
-
-
-
@@ -7,9 +7,11 @@ import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.view.View
 import android.view.Window
-import android.view.WindowManager
+import android.widget.LinearLayout
 import androidx.annotation.StyleRes
-import androidx.fragment.app.FragmentActivity
+import androidx.core.view.updateLayoutParams
+import com.shuwei.dish.match.base.DeviceRole
+import com.shuwei.dish.match.base.GlobalData
 import com.shuwei.dish.match.databinding.DialogCommonBinding
 import com.shuwei.dish.match.utils.ext.dp
 import java.lang.ref.WeakReference
@@ -20,53 +22,112 @@ open class CommonDialog(

    private lateinit var binding: DialogCommonBinding

+    private var titleText: String? = null
+    private var contentText: CharSequence? = null
+    private var negativeText = "取消"
+    private var positiveText = "确认"
+    private var neutralText: String? = null
+    private var negativeClick: (() -> Unit)? = null
+    private var positiveClick: (() -> Unit)? = null
+    private var neutralClick: (() -> Unit)? = null
+    private var dismissCallback: (() -> Unit)? = null
+
+    /** 设置标题，为空时隐藏 */
+    fun setTitle(text: String): CommonDialog = apply { titleText = text }
+
+    /** 设置内容，为空时隐藏 */
+    fun setContent(text: CharSequence): CommonDialog = apply { contentText = text }
+
+    /** 设置左侧取消按钮文字及点击回调（3按钮模式下对应顶部按钮） */
+    fun setNegativeButton(text: String, onClick: (() -> Unit)? = null): CommonDialog = apply {
+        negativeText = text
+        negativeClick = onClick
+    }
+
+    /** 设置右侧确认按钮文字及点击回调（3按钮模式下对应底部按钮） */
+    fun setPositiveButton(text: String, onClick: (() -> Unit)? = null): CommonDialog = apply {
+        positiveText = text
+        positiveClick = onClick
+    }
+
+    /** 设置中间第三个按钮文字及点击回调，调用后自动切换为垂直3按钮布局 */
+    fun setNeutralButton(text: String, onClick: (() -> Unit)? = null): CommonDialog = apply {
+        neutralText = text
+        neutralClick = onClick
+    }
+
+    /** 设置弹窗消失回调 */
+    fun setOnDismissCallback(callback: () -> Unit): CommonDialog = apply {
+        dismissCallback = callback
+    }
+
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        requestWindowFeature(Window.FEATURE_NO_TITLE)
        binding = DialogCommonBinding.inflate(layoutInflater)
        setContentView(binding.root)
        window?.run {
-//            decorView.setPadding(0.dp, 0, 0.dp, 0)
+            val screenWidth = context.resources.displayMetrics.widthPixels
+            val isMaster = GlobalData.deviceRole == DeviceRole.MASTER
            attributes = attributes.apply {
-                width = 708.dp
+                width = if (isMaster) (screenWidth * 0.72f).toInt() else (screenWidth * 0.60f).toInt()
            }
            setBackgroundDrawable(ColorDrawable())
            setCancelable(false)
-//            setFlags(
-//                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
-//                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
-//            )
+        }
+        val verticalMargin = if (GlobalData.deviceRole == DeviceRole.MASTER) 35.dp else 20.dp
+        binding.tvTitle.updateLayoutParams<LinearLayout.LayoutParams> { topMargin = verticalMargin }
+        binding.tvContent.updateLayoutParams<LinearLayout.LayoutParams> { bottomMargin = verticalMargin }
+
+        // 2按钮点击事件
+        binding.btnLeft.setOnClickListener {
+            negativeClick?.invoke()
+            dismiss()
+        }
+        binding.btnRight.setOnClickListener {
+            positiveClick?.invoke()
+            dismiss()
        }

-        binding.llContent.run {
-            removeAllViews()
-            addView(messageView)
+        // 3按钮点击事件（negativeClick/positiveClick 与2按钮模式共用）
+        binding.btnTop.setOnClickListener {
+            negativeClick?.invoke()
+            dismiss()
        }
-        addListener()
+        binding.btnMiddle.setOnClickListener {
+            neutralClick?.invoke()
+            dismiss()
+        }
+        binding.btnBottom.setOnClickListener {
+            positiveClick?.invoke()
+            dismiss()
        }

-    private fun addListener() {
-        binding.btnLeft.setOnClickListener { onLeftClick?.invoke() }
-        binding.btnRight.setOnClickListener { onRightClick?.invoke() }
-        setOnDismissListener { onDismiss?.invoke() }
+        setOnDismissListener { dismissCallback?.invoke() }
    }

-
    override fun show() {
        super.show()
-        binding.btnLeft.text = leftText
-        binding.btnRight.text = rightText
+        binding.tvTitle.text = titleText
+        binding.tvContent.text = contentText
+        binding.tvTitle.visibility = if (titleText.isNullOrEmpty()) View.GONE else View.VISIBLE
+        binding.tvContent.visibility = if (contentText.isNullOrEmpty()) View.GONE else View.VISIBLE
+
+        val hasThreeButtons = !neutralText.isNullOrEmpty()
+        binding.layoutButtonsHorizontal.visibility = if (hasThreeButtons) View.GONE else View.VISIBLE
+        binding.layoutButtonsVertical.visibility = if (hasThreeButtons) View.VISIBLE else View.GONE
+
+        if (hasThreeButtons) {
+            // 3按钮模式：顶部=取消，中间=中立，底部=确认
+            binding.btnTop.text = negativeText
+            binding.btnMiddle.text = neutralText
+            binding.btnBottom.text = positiveText
+        } else {
+            // 2按钮模式
+            binding.btnLeft.text = negativeText
+            binding.btnRight.text = positiveText
+        }
    }
-
-    var messageView: View? = null
-    var onLeftClick: (() -> Unit)? = null
-    var onRightClick: (() -> Unit)? = null
-
-    var leftText = ""
-    var rightText = ""
-
-    var onDismiss: (() -> Unit)? = null
-
 }

 open class SafeDialog(activity: Activity, @StyleRes themeResId: Int) :
@@ -1,38 +0,0 @@
-package com.shuwei.dish.match.dialog
-
-import android.content.Context
-import android.view.LayoutInflater
-import com.shuwei.dish.match.databinding.LayoutFoodRemindBinding
-
-object DialogTool {
-
-    fun load(
-        context: Context,
-        title:String,
-        content:String,
-        leftBtnText: String,
-        rightBtnText: String,
-        leftBtnClick: () -> Unit = {},
-        rightBtnClick: () -> Unit = {}
-    ) {
-        val layoutInflater = LayoutInflater.from(context)
-        val remindBinding = LayoutFoodRemindBinding.inflate(layoutInflater)
-        remindBinding.tvDialogTitle.text = title
-        remindBinding.tvDialogContent.text = content
-        CommonDialog(context).apply {
-            messageView = remindBinding.root
-            leftText = leftBtnText
-            rightText = rightBtnText
-            onLeftClick = {
-                leftBtnClick()
-                dismiss()
-            }
-            onRightClick = {
-                rightBtnClick()
-                dismiss()
-            }
-            onDismiss = { }
-        }.show()
-    }
-
-}
@@ -0,0 +1,62 @@
+package com.shuwei.dish.match.dialog
+
+import android.annotation.SuppressLint
+import android.os.Handler
+import android.os.Looper
+import android.view.LayoutInflater
+import androidx.recyclerview.widget.GridLayoutManager
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.shuwei.dish.match.R
+import com.shuwei.dish.match.adapter.GoodsInfoSearchAdapter
+import com.shuwei.dish.match.base.BaseActivity
+import com.shuwei.dish.match.databinding.DialogFoodRecognizeBinding
+import com.shuwei.dish.match.entity.CookFoodGoodsEntity
+
+/**
+ * 菜品识别结果弹窗，继承 BottomSheetDialog 确保只初始化一次
+ * @param activity 宿主 Activity
+ * @param onDismiss 弹窗关闭时的额外回调（可选）
+ * @param onItemSelected 用户点击某一菜品时的回调
+ */
+class FoodRecognizeDialog(
+    private val activity: BaseActivity,
+    private val onDismiss: (() -> Unit)? = null,
+    private val onItemSelected: (item: CookFoodGoodsEntity) -> Unit
+) : BottomSheetDialog(activity, R.style.BottomSheet) {
+
+    private val binding = DialogFoodRecognizeBinding.inflate(LayoutInflater.from(activity))
+    private val list = mutableListOf<CookFoodGoodsEntity>()
+    private val adapter = GoodsInfoSearchAdapter(list).apply {
+        setOnItemClickListener { _, _, position ->
+            list[position].isClicked = true
+            notifyItemChanged(position)
+            Handler(Looper.getMainLooper()).postDelayed({
+                onItemSelected(list[position])
+                dismiss()
+            }, 300)
+        }
+    }
+
+    init {
+        setContentView(binding.root)
+        setCancelable(true)
+        behavior.skipCollapsed = false
+        setOnDismissListener { activity.hideStatusBar(); onDismiss?.invoke() }
+        binding.recyclerView.run {
+            layoutManager = GridLayoutManager(activity, 2, GridLayoutManager.VERTICAL, false)
+            adapter = this@FoodRecognizeDialog.adapter
+        }
+    }
+
+    /**
+     * 加载识别结果数据并显示弹窗
+     * @param items 识别到的菜品列表
+     */
+    @SuppressLint("NotifyDataSetChanged")
+    fun loadData(items: List<CookFoodGoodsEntity>) {
+        list.clear()
+        list.addAll(items)
+        adapter.notifyDataSetChanged()
+        if (!isShowing) show()
+    }
+}
@@ -0,0 +1,186 @@
+package com.shuwei.dish.match.dialog
+
+import android.annotation.SuppressLint
+import android.os.Handler
+import android.os.Looper
+import android.text.Editable
+import android.view.LayoutInflater
+import android.view.View
+import androidx.core.view.isEmpty
+import androidx.core.widget.addTextChangedListener
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.shuwei.dish.match.R
+import com.shuwei.dish.match.adapter.GoodsInfoSearchAdapter
+import com.shuwei.dish.match.base.BaseActivity
+import com.shuwei.dish.match.base.BaseApp
+import com.shuwei.dish.match.databinding.DialogFoodSearchBinding
+import com.shuwei.dish.match.entity.CookFoodGoodsEntity
+import com.shuwei.dish.match.net.UiState
+import com.shuwei.dish.match.utils.KeyboardUtil
+import com.shuwei.dish.match.utils.ext.addOnActionSearchListener
+import com.shuwei.dish.match.utils.ext.toast
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.launch
+
+/**
+ * 食材搜索弹窗，继承 BottomSheetDialog 确保只初始化一次
+ * @param activity 宿主 Activity
+ * @param defGoodsName 默认填充的食材名称（可选）
+ * @param onItemSelected 用户点击某一食材时的回调
+ */
+class FoodSearchDialog(
+    private val activity: BaseActivity,
+    private val defGoodsName: String? = null,
+    private val onItemSelected: (item: CookFoodGoodsEntity) -> Unit
+) : BottomSheetDialog(activity, R.style.BottomSheet) {
+
+    private val binding = DialogFoodSearchBinding.inflate(LayoutInflater.from(activity))
+    private val list = mutableListOf<CookFoodGoodsEntity>()
+    private val adapter = GoodsInfoSearchAdapter(list).apply {
+        setOnItemClickListener { _, _, position ->
+            list[position].isClicked = true
+            notifyItemChanged(position)
+            Handler(Looper.getMainLooper()).postDelayed({
+                onItemSelected(list[position])
+                dismiss()
+            }, 300)
+        }
+    }
+
+    private var goodsName: String? = null
+    private var pageNo = 1
+    private val pageSize = 50
+
+    init {
+        setContentView(binding.root)
+        setCancelable(true)
+        behavior.skipCollapsed = false
+        setOnDismissListener { activity.hideStatusBar() }
+
+        binding.tvSheetName.text = "食材检索"
+
+        // 输入框：清空时重置列表
+        binding.etSheetInput.run {
+            hint = "输入食材名称或速记码"
+            addTextChangedListener(
+                onTextChanged = { text, _, _, _ -> goodsName = text.toString() },
+                afterTextChanged = { it: Editable? ->
+                    if (it.isNullOrBlank()) {
+                        list.clear()
+                        adapter.notifyDataSetChanged()
+                    }
+                }
+            )
+            addOnActionSearchListener { searchGoods(this) }
+        }
+
+        // RecyclerView 初始化及滑动冲突处理
+        binding.recyclerView.run {
+            layoutManager = GridLayoutManager(activity, 2, GridLayoutManager.VERTICAL, false)
+            adapter = this@FoodSearchDialog.adapter
+            addOnScrollListener(object : RecyclerView.OnScrollListener() {
+                override fun onScrolled(rv: RecyclerView, dx: Int, dy: Int) {
+                    super.onScrolled(rv, dx, dy)
+                    // 解决 RecyclerView 与 SmartRefreshLayout 滑动冲突
+                    val topRowVerticalPosition = if (rv.isEmpty()) 0 else rv.getChildAt(0).top
+                    binding.refreshLayout.setNestedScrollingEnabled(topRowVerticalPosition >= 0)
+                }
+            })
+        }
+
+        binding.refreshLayout.run {
+            setEnableRefresh(false)
+            setEnableLoadMore(false)
+            setOnRefreshListener { pageNo = 1; getGoodsList() }
+            setOnLoadMoreListener { getGoodsList() }
+        }
+
+        binding.ivSearch.setOnClickListener { searchGoods(it) }
+        binding.root.setOnClickListener { KeyboardUtil.hideKeyboard(it) }
+
+        initObserver()
+
+        // 若有默认食材名称，自动填充并触发搜索
+        if (!defGoodsName.isNullOrBlank()) {
+            binding.etSheetInput.setText(defGoodsName)
+            searchGoods(binding.etSheetInput)
+        }
+    }
+
+    /**
+     * 收集 goodsListState，统一处理 Loading / Success / Error 状态
+     */
+    private fun initObserver() {
+        activity.lifecycleScope.launch {
+            activity.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                activity.netViewModel.goodsListState.collect { state ->
+                    when (state) {
+                        is UiState.Success -> loadGoodsList(state.data)
+                        is UiState.Error -> {
+                            activity.toast(state.msg)
+                            finishRefresh()
+                        }
+                        else -> {}
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 触发搜索：校验输入、隐藏键盘、发起请求
+     */
+    private fun searchGoods(v: View) {
+        if (goodsName.isNullOrBlank()) {
+            activity.toast("请${binding.etSheetInput.hint}")
+            return
+        }
+        pageNo = 1
+        getGoodsList()
+        KeyboardUtil.hideKeyboard(v)
+    }
+
+    /**
+     * 请求食材列表
+     */
+    private fun getGoodsList() {
+        val param = mutableMapOf<String, Any>(
+            "goodsType" to "0",
+            "placeId" to BaseApp.canteenId,
+            "pageNum" to pageNo,
+            "pageSize" to pageSize
+        )
+        if (!goodsName.isNullOrBlank()) {
+            param["goodsName"] = goodsName!!
+        }
+        activity.netViewModel.queryGoodsList(param)
+    }
+
+    /**
+     * 将返回数据填充到列表
+     */
+    @SuppressLint("NotifyDataSetChanged")
+    private fun loadGoodsList(records: MutableList<CookFoodGoodsEntity>?) {
+        finishRefresh()
+        if (records.isNullOrEmpty()) {
+            activity.toast("暂未搜索到食材信息")
+            return
+        }
+        if (pageNo == 1) list.clear()
+        list.addAll(records)
+        adapter.notifyDataSetChanged()
+        val isLoadMoreEnable = records.size >= pageSize
+        binding.refreshLayout.setEnableLoadMore(isLoadMoreEnable)
+        if (isLoadMoreEnable) pageNo++
+    }
+
+    private fun finishRefresh() {
+        if (pageNo == 1) binding.refreshLayout.finishRefresh()
+        else binding.refreshLayout.finishLoadMore()
+    }
+}
@@ -13,14 +13,22 @@ object Loading {

    private var dialog: LoadingDialog? = null

-    fun show(context: Context) {
+    fun isShowing(): Boolean {
+        return dialog != null && dialog!!.isShowing
+    }
+
+    fun updateContent(content: String) {
+        if (isShowing().not()) return
+        dialog!!.updateContent(content)
+    }
+
+    fun show(context: Context, message: String = "加载中……", onDismiss: () -> Unit = {}) {
        try {
            if (dialog?.isShowing == true) {
                dialog?.dismiss()
            }
-
            if (dialog == null) {
-                dialog = LoadingDialog(context)
+                dialog = LoadingDialog(context = context, message = message, onDismiss = onDismiss)
            }
            dialog?.show()
        } catch (e: Exception) {
@@ -45,25 +53,32 @@ object Loading {

 class LoadingDialog(
    context: Context,
-    message: String = "加载中……",
-    private var onDismiss: () -> Unit = {}
+    message: String,
+    private var onDismiss: () -> Unit
 ) : Dialog(context, R.style.LoadingDialog) {
+    private val binding: DialogLoadingBinding by lazy {
+        DialogLoadingBinding.inflate(LayoutInflater.from(context))
+    }
+
    init {
-        val binding = DialogLoadingBinding.inflate(LayoutInflater.from(context))
        binding.tvMessage.text = message
        setContentView(binding.root)
        setCancelable(true)
        window?.run {
            setBackgroundDrawable(Color.TRANSPARENT.toDrawable())
-            setFlags(
-                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
-                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
-            );
+//            setFlags(
+//                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
+//                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+//            );
        }
        setOnDismissListener {
            onDismiss()
        }
    }
+
+    fun updateContent(content: String) {
+        binding.tvMessage.text = content
+    }
 }

 //class LoadingDialog3(
@@ -0,0 +1,259 @@
+package com.shuwei.dish.match.dialog
+
+import android.annotation.SuppressLint
+import android.graphics.Typeface
+import android.os.Handler
+import android.os.Looper
+import android.text.SpannableStringBuilder
+import android.text.style.AbsoluteSizeSpan
+import android.text.style.ForegroundColorSpan
+import android.text.style.LineHeightSpan
+import android.text.style.StyleSpan
+import android.util.Log
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import androidx.core.graphics.toColorInt
+import androidx.core.view.isEmpty
+import androidx.core.widget.addTextChangedListener
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.shuwei.dish.match.R
+import com.shuwei.dish.match.adapter.SeasoningSearchAdapter
+import com.shuwei.dish.match.base.BaseActivity
+import com.shuwei.dish.match.base.BaseApp
+import com.shuwei.dish.match.databinding.DialogSeasoningSearchBinding
+import com.shuwei.dish.match.entity.SeasoningEntity
+import com.shuwei.dish.match.net.UiState
+import com.shuwei.dish.match.utils.KeyboardUtil
+import com.shuwei.dish.match.utils.WeightUtil
+import com.shuwei.dish.match.utils.ext.addOnActionSearchListener
+import com.shuwei.dish.match.utils.ext.appendText
+import com.shuwei.dish.match.utils.ext.buildSpannableString
+import com.shuwei.dish.match.utils.ext.dp
+import com.shuwei.dish.match.utils.ext.roundedDecimalPlace
+import com.shuwei.dish.match.utils.ext.toast
+import kotlinx.coroutines.launch
+
+/**
+ * 调料搜索弹窗，继承 BottomSheetDialog 确保只初始化一次
+ * @param activity 宿主 Activity
+ * @param weighIndex 秤的索引
+ * @param weighAddress 秤的地址，用于监听重量和去皮
+ * @param clickName 默认填充的调料名称（可选）
+ * @param onItemSelected 用户点击某一调料时的回调，携带当前重量
+ */
+class SeasoningSearchDialog(
+    private val activity: BaseActivity,
+    private val weighIndex: Int,
+    private val weighAddress: Int,
+    private val clickName: String? = null,
+    private val onItemSelected: (item: SeasoningEntity) -> Unit
+) : BottomSheetDialog(activity, R.style.BottomSheet) {
+
+    companion object {
+        const val TAG = "BottomDialog2"
+    }
+
+    private val binding = DialogSeasoningSearchBinding.inflate(LayoutInflater.from(activity))
+    private val list = mutableListOf<SeasoningEntity>()
+    private val adapter = SeasoningSearchAdapter(list).apply {
+        setOnItemClickListener { _, _, position ->
+            list[position].isClicked = true
+            notifyItemChanged(position)
+            Handler(Looper.getMainLooper()).postDelayed({
+                onItemSelected(list[position].also { it.useWeight = currentWeight })
+                dismiss()
+            }, 300)
+        }
+    }
+
+    private var goodsName: String? = null
+    private var currentWeight = 0.0
+    private var pageNo = 1
+    private val pageSize = 50
+
+    init {
+        setContentView(binding.root)
+        setCancelable(true)
+        behavior.skipCollapsed = false
+        window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
+        window?.setGravity(Gravity.BOTTOM)
+        window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        window?.setWindowAnimations(R.style.DialogSoftInputAnimation)
+        window?.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
+
+        setOnDismissListener {
+            // 弹窗关闭时移除重量监听，避免内存泄漏
+            WeightUtil.removeWeightListener(TAG)
+            activity.hideStatusBar()
+        }
+
+        // 输入框：清空时重置列表
+        binding.etSheetInput.run {
+            hint = "输入调料名称"
+            addTextChangedListener(
+                onTextChanged = { text, _, _, _ -> goodsName = text.toString() },
+                afterTextChanged = {
+                    if (it.isNullOrBlank()) {
+                        list.clear()
+                        adapter.notifyDataSetChanged()
+                    }
+                }
+            )
+            addOnActionSearchListener { searchGoods(this) }
+        }
+
+        // RecyclerView 初始化及滑动冲突处理
+        binding.recyclerView.let {
+            it.layoutManager = GridLayoutManager(activity, 2, GridLayoutManager.VERTICAL, false)
+            it.adapter = adapter
+            it.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+                override fun onScrolled(rv: RecyclerView, dx: Int, dy: Int) {
+                    super.onScrolled(rv, dx, dy)
+                    // 解决 RecyclerView 与 SmartRefreshLayout 滑动冲突
+                    val topRowVerticalPosition = if (rv.isEmpty()) 0 else rv.getChildAt(0).top
+                    binding.refreshLayout.setNestedScrollingEnabled(topRowVerticalPosition >= 0)
+                }
+            })
+        }
+
+        binding.refreshLayout.run {
+            setEnableRefresh(false)
+            setEnableLoadMore(false)
+            setOnRefreshListener { pageNo = 1; getGoodsList() }
+            setOnLoadMoreListener { getGoodsList() }
+        }
+
+        binding.ivSearch.setOnClickListener { searchGoods(it) }
+        binding.root.setOnClickListener { KeyboardUtil.hideKeyboard(it) }
+
+        // 去皮按钮
+        binding.tvClear.setOnClickListener {
+            Log.d(TAG, "tareTwo: weighAddress=$weighAddress")
+            WeightUtil.tareTwo(weighAddress)
+        }
+
+        // 监听对应秤的重量变化
+        WeightUtil.addWeightListener(
+            weightKey = TAG,
+            getWeight = { address, _, weight ->
+                if (weighAddress == address) {
+                    currentWeight = weight.toDouble()
+                    binding.tvWeight.text = getTextSpan(weight)
+                }
+            }
+        )
+        binding.tvWeight.text = getTextSpan(0.0)
+
+        initObserver()
+
+        // 若有默认调料名称，自动填充并触发搜索
+        if (!clickName.isNullOrBlank()) {
+            binding.etSheetInput.setText(clickName.trim())
+            pageNo = 1
+            getGoodsList()
+        }
+    }
+
+    /**
+     * 收集 seasoningListState，统一处理 Loading / Success / Error 状态
+     */
+    private fun initObserver() {
+        activity.lifecycleScope.launch {
+            activity.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                activity.netViewModel.seasoningListState.collect { state ->
+                    when (state) {
+                        is UiState.Success -> loadGoodsList(state.data)
+                        is UiState.Error -> {
+                            activity.toast(state.msg)
+                            finishRefresh()
+                        }
+                        else -> {}
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 触发搜索：校验输入、隐藏键盘、发起请求
+     */
+    private fun searchGoods(v: View) {
+        if (goodsName.isNullOrBlank()) {
+            activity.toast("请${binding.etSheetInput.hint}")
+            return
+        }
+        pageNo = 1
+        getGoodsList()
+        KeyboardUtil.hideKeyboard(v)
+    }
+
+    /**
+     * 请求调料列表
+     */
+    private fun getGoodsList() {
+        val param = mutableMapOf<String, Any>(
+            "goodsType" to "1",
+            "placeId" to BaseApp.canteenId,
+            "pageNum" to pageNo,
+            "pageSize" to pageSize
+        )
+        if (!goodsName.isNullOrBlank()) {
+            param["goodsName"] = goodsName!!
+        }
+        activity.netViewModel.querySeasoningList(param)
+    }
+
+    /**
+     * 将返回数据填充到列表
+     */
+    @SuppressLint("NotifyDataSetChanged")
+    private fun loadGoodsList(records: MutableList<SeasoningEntity>?) {
+        finishRefresh()
+        if (records.isNullOrEmpty()) {
+            activity.toast("暂未搜索到调料信息")
+            return
+        }
+        if (pageNo == 1) list.clear()
+        list.addAll(records)
+        adapter.notifyDataSetChanged()
+        val isLoadMoreEnable = records.size >= pageSize
+        binding.refreshLayout.setEnableLoadMore(isLoadMoreEnable)
+        if (isLoadMoreEnable) pageNo++
+    }
+
+    private fun finishRefresh() {
+        if (pageNo == 1) binding.refreshLayout.finishRefresh()
+        else binding.refreshLayout.finishLoadMore()
+    }
+
+    /**
+     * 生成重量显示的富文本：数值大字加粗，单位小字灰色
+     */
+    fun getTextSpan(weight: Double): SpannableStringBuilder {
+        val topWeight = if (weight >= 1000) "${(weight / 1000).roundedDecimalPlace(3)}" else "$weight"
+        val bottomUnit = if (weight >= 1000) "千克" else "克"
+        return buildSpannableString {
+            appendText(
+                topWeight,
+                ForegroundColorSpan("#000000".toColorInt()),
+                StyleSpan(Typeface.BOLD),
+                AbsoluteSizeSpan(72, true),
+                LineHeightSpan { _, _, _, _, _, fm -> fm.descent += 10.dp }
+            )
+            append("\n")
+            appendText(
+                bottomUnit,
+                ForegroundColorSpan("#999999".toColorInt()),
+                AbsoluteSizeSpan(30, true)
+            )
+        }
+    }
+}
@@ -0,0 +1,200 @@
+package com.shuwei.dish.match.dialog
+
+import android.annotation.SuppressLint
+import android.graphics.Rect
+import android.os.Handler
+import android.os.Looper
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
+import android.view.Window
+import android.view.WindowManager
+import androidx.core.widget.addTextChangedListener
+import androidx.recyclerview.widget.GridLayoutManager
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.shuwei.dish.match.R
+import com.shuwei.dish.match.adapter.SeasoningSearchAdapter
+import com.shuwei.dish.match.base.BaseActivity
+import com.shuwei.dish.match.databinding.DialogSeasoningSelectBinding
+import com.shuwei.dish.match.entity.SeasoningEntity
+import com.shuwei.dish.match.utils.KeyboardUtil
+import com.shuwei.dish.match.utils.ext.addOnActionSearchListener
+import com.shuwei.dish.match.utils.ext.toast
+
+/**
+ * 调料选择弹窗，不含重量显示，继承 BottomSheetDialog 确保只初始化一次
+ * @param activity 宿主 Activity
+ * @param clickIndex 点击的调料槽位索引
+ * @param onItemSelected 用户点击某一调料时的回调
+ */
+class SeasoningSelectDialog(
+    private val activity: BaseActivity,
+    private val onItemSelected: (item: SeasoningEntity) -> Unit
+) : BottomSheetDialog(activity, R.style.BottomSheet) {
+
+    companion object {
+        const val TAG = "SeasoningSelectDialog"
+    }
+
+    private val binding = DialogSeasoningSelectBinding.inflate(LayoutInflater.from(activity))
+    private val list = mutableListOf<SeasoningEntity>()
+    private val adapter = SeasoningSearchAdapter(list).apply {
+        setOnItemClickListener { _, _, position ->
+            list[position].isClicked = true
+            notifyItemChanged(position)
+            Handler(Looper.getMainLooper()).postDelayed({
+                onItemSelected(list[position])
+                dismiss()
+            }, 300)
+        }
+    }
+
+    private var goodsName: String? = null
+    private var pageNo = 1
+    private val pageSize = 50
+
+    init {
+        setContentView(binding.root)
+        setCancelable(true)
+        behavior.skipCollapsed = false
+        window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
+        window?.setGravity(Gravity.BOTTOM)
+        window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        window?.setWindowAnimations(R.style.DialogSoftInputAnimation)
+        window?.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
+
+        setOnDismissListener {
+            activity.hideStatusBar()
+        }
+
+        // 输入框：清空时重置列表
+        binding.etSheetInput.run {
+            hint = "输入调料名称"
+            addTextChangedListener(
+                onTextChanged = { text, _, _, _ -> goodsName = text.toString() },
+                afterTextChanged = {
+                    if (it.isNullOrBlank()) {
+                        list.clear()
+                        adapter.notifyDataSetChanged()
+                    }
+                }
+            )
+            addOnActionSearchListener { searchGoods(this) }
+        }
+
+        // RecyclerView 初始化
+        binding.recyclerView.run {
+            layoutManager = GridLayoutManager(activity, 3, GridLayoutManager.VERTICAL, false)
+            adapter = this@SeasoningSelectDialog.adapter
+        }
+
+        binding.refreshLayout.run {
+            setEnableRefresh(false)
+            setEnableLoadMore(false)
+            setOnRefreshListener { pageNo = 1; getGoodsList() }
+            setOnLoadMoreListener { getGoodsList() }
+        }
+
+        binding.ivSearch.setOnClickListener { searchGoods(it) }
+        binding.root.setOnClickListener { KeyboardUtil.hideKeyboard(it) }
+    }
+
+    /** 弹窗显示时自动加载默认调料列表，并在 Window.Callback 层提前拦截触摸以解决滑动冲突 */
+    override fun show() {
+        super.show()
+        pageNo = 1
+        getGoodsList()
+        // Window.Callback.dispatchTouchEvent 在整个 View 树的 onInterceptTouchEvent 之前执行，
+        // 是最早能感知触摸的时机。在此处判断触摸点位置来控制 behavior.isDraggable，
+        // 从而确保 BottomSheetBehavior 在 CoordinatorLayout.onInterceptTouchEvent 时
+        // 已经是禁用状态，不会拦截列表区域的滑动手势。
+        val originalCallback = window?.callback ?: return
+        window?.callback = object : Window.Callback by originalCallback {
+            override fun dispatchTouchEvent(event: MotionEvent): Boolean {
+                when (event.actionMasked) {
+                    MotionEvent.ACTION_DOWN -> {
+                        val rect = Rect()
+                        binding.refreshLayout.getGlobalVisibleRect(rect)
+                        // 触摸点落在列表区域内则禁止 BottomSheet 拖拽
+                        behavior.isDraggable = !rect.contains(event.rawX.toInt(), event.rawY.toInt())
+                    }
+                    MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
+                        behavior.isDraggable = true
+                    }
+                }
+                return originalCallback.dispatchTouchEvent(event)
+            }
+        }
+    }
+
+    /**
+     * 触发搜索：校验输入、隐藏键盘、发起请求
+     */
+    private fun searchGoods(v: View) {
+        if (goodsName.isNullOrBlank()) {
+            activity.toast("请${binding.etSheetInput.hint}")
+            return
+        }
+        pageNo = 1
+        getGoodsList()
+        KeyboardUtil.hideKeyboard( v)
+    }
+
+    /**
+     * 请求调料列表（临时使用本地模拟数据，正式联调时替换为真实接口）
+     */
+    private fun getGoodsList() {
+        // TODO: 联调时注释掉下方模拟数据，取消注释真实接口调用
+        val nameList = listOf(
+            "盐", "白砂糖","冰糖", "鸡精", "味精", "陈醋", "老抽", "生抽", "番茄酱", "胡椒粉", "孜然", "十三香",
+            "料酒", "白醋", "蚝油", "辣椒面", "辣椒酱", "豆瓣酱", "淀粉", "葱", "蒜", "姜", "香菜", "油"
+        )
+        val mockData = mutableListOf<SeasoningEntity>()
+        nameList.forEachIndexed { index, name ->
+            val padString = "${index + 1}".padStart(2, '0')
+            mockData.add(SeasoningEntity(goodsId = "1000$padString", goodsName = name))
+        }
+        loadGoodsList(mockData)
+
+//        val param = mutableMapOf<String, Any>(
+//            "goodsType" to "1",
+//            "placeId" to BaseApp.canteenId,
+//            "pageNum" to pageNo,
+//            "pageSize" to pageSize
+//        )
+//        if (!goodsName.isNullOrBlank()) {
+//            param["goodsName"] = goodsName!!
+//        }
+//        activity.querySeasoningList(param = param, onSuccess = {
+//            loadGoodsList(it)
+//        }, onFailure = { _, msg ->
+//            activity.toast(msg)
+//            finishRefresh()
+//        })
+    }
+
+    /**
+     * 将返回数据填充到列表
+     */
+    @SuppressLint("NotifyDataSetChanged")
+    private fun loadGoodsList(records: MutableList<SeasoningEntity>?) {
+        finishRefresh()
+        if (records.isNullOrEmpty()) {
+            activity.toast("暂未搜索到调料信息")
+            return
+        }
+        if (pageNo == 1) list.clear()
+        list.addAll(records)
+        adapter.notifyDataSetChanged()
+        val isLoadMoreEnable = records.size >= pageSize
+        binding.refreshLayout.setEnableLoadMore(isLoadMoreEnable)
+        if (isLoadMoreEnable) pageNo++
+    }
+
+    private fun finishRefresh() {
+        if (pageNo == 1) binding.refreshLayout.finishRefresh()
+        else binding.refreshLayout.finishLoadMore()
+    }
+}
@@ -0,0 +1,11 @@
+package com.shuwei.dish.match.entity
+
+/**
+ * 已采集食材列表项数据模型
+ * @param foodName 食材名称
+ * @param collectCount 已采集数量
+ */
+data class CollectedFoodItem(
+    val foodName: String = "",
+    val collectCount: Int = 0
+)
@@ -23,6 +23,10 @@ data class CookFoodEntity(
 ) : BaseEntity {
    @Ignore
    var stFoodInfoConstituteList: MutableList<CookFoodGoodsEntity>? = null
+    @Ignore
+    var matchingConstituteInfoList: MutableList<CookFoodGoodsEntity>? = null
+    @Ignore
+    var foodConstituteList: MutableList<CookFoodGoodsEntity>? = null

    constructor() : this(foodId = "") // 必需的空构造
 }
@@ -43,10 +43,14 @@ class CookFoodGoodsEntity(
     */
    var materialType: Int = 0,

+//    /**
+//     * 物品 是否全部可食：1-全部可食，0-部分可食，默认全部
+//     */
+//    var allEdible: Int = 1,
    /**
-     * 物品 是否全部可食：1-全部可食，0-部分可食，默认全部
+     * 物品 是否全部可食：true-全部可食，false-部分可食，默认全部
     */
-    var allEdible: Int = 1,
+    var allEdible: Boolean = true,

    /**
     * 物品 用料重量
@@ -78,4 +82,11 @@ class CookFoodGoodsEntity(

    @Ignore
    var isClicked: Boolean = false
+
+    //true-原始数据，false-非原始数据
+    @Ignore
+    var isOriginalData: Boolean = true
+
+    @Ignore
+    var foodScore: Int = -1
 }
@@ -13,7 +13,8 @@ data class FoodRecord(
    var cookMode: Int = 0,
    //1-早餐，2-午餐，3-晚餐
    var dinnerType: String = "0",
-
+    //true-原始数据，false-非原始数据
+    var isOriginalData: Boolean = true,
    var sort: Int = 0
 ) : Serializable

@@ -36,11 +36,14 @@ data class SeasoningEntity(
     */
    var materialType: Int = 3,

+//    /**
+//     * 物品 是否全部可食：1-全部可食，0-部分可食，默认全部
+//     */
+//    var allEdible: Int = 1,
    /**
-     * 物品 是否全部可食：1-全部可食，0-部分可食，默认全部
+     * 物品 是否全部可食：true-全部可食，false-部分可食，默认全部
     */
-    var allEdible: Int = 1,
-
+    var allEdible: Boolean = true,
    /**
     * 物品 用料重量
     */
@@ -0,0 +1,23 @@
+package com.shuwei.dish.match.entity
+
+import androidx.room.Entity
+
+/**
+ * 调料槽位配置表，记录每个格子对应哪种调料
+ * 主键为 (deviceId, address) 组合，唯一标识一个物理秤槽位
+ *
+ * @param deviceId 所属设备 ID，用于区分 22格/18格 设备
+ * @param address  秤硬件地址，对应 ScaleDeviceConfig.SCALE_ORDER_22/18 中的值
+ * @param goodsId  调料 ID
+ * @param goodsName 调料名称，用于 adapter 展示
+ */
+@Entity(
+    tableName = "dm_seasoning_slot",
+    primaryKeys = ["deviceId", "address"]
+)
+data class SeasoningSlotEntity(
+    val deviceId: String,
+    val address: Int,
+    val goodsId: String,
+    val goodsName: String
+)
@@ -1,199 +0,0 @@
-package com.shuwei.dish.match.http
-
-import android.os.Handler
-import android.os.Looper
-import android.util.Log
-import com.google.gson.reflect.TypeToken
-import com.shuwei.dish.match.base.BaseApp
-import com.shuwei.dish.match.base.BaseReq
-import com.shuwei.dish.match.utils.SpTool
-import com.shuwei.dish.match.utils.ext.toType
-import okhttp3.Call
-import okhttp3.Callback
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
-import okhttp3.Request
-import okhttp3.RequestBody.Companion.toRequestBody
-import okhttp3.Response
-import java.io.IOException
-import java.util.concurrent.Executors
-import java.util.concurrent.TimeUnit
-
-
-object HttpUtil {
-
-    var loopGetToken = true
-
-    fun runMainThread(action: () -> Unit) {
-        Handler(Looper.getMainLooper()).post {
-            action()
-        }
-    }
-
-    // GET请求（HTTPS）
-    fun get(
-        url: String,
-        header: Map<String, String>?=null,
-        doSuccess: (data: Any) -> Unit,
-        doFailure: (code: Int?, msg: String?) -> Unit
-    ) {
-        val request = Request.Builder()
-            .url(if (url.isHttpApi()) url else UrlConfig.BASE_URL + url)
-            .apply {
-                if (header != null) {
-                    header.forEach {
-                        addHeader(it.key, it.value)
-                    }
-                } else {
-                    val token = getToken()
-                    if (token.isNotBlank()) {
-                        addHeader("X-Access-Token", token)
-                    }
-                }
-            }
-            .get()
-            .build()
-        HttpClient.instance.newCall(request).enqueue(CallbackImpl(doSuccess, doFailure))
-    }
-//
-//    fun get(
-//        isHttps: Boolean = false,
-//        host: String = "vip.shuziweidao.com",
-//        pathSegmentList: List<String>,
-//        queryParams: Map<String, String>,
-//        doSuccess: (data: Any) -> Unit,
-//        doFailure: (code: Int?, msg: String?) -> Unit
-//    ) {
-//        val token = getToken()
-//        val url = HttpUrl.Builder()
-//            .scheme(if (isHttps) "https" else "http")
-//            .host(host)
-//            .apply {
-//                pathSegmentList.forEach { addPathSegment(it) }
-//                queryParams.forEach { (key, value) -> addQueryParameter(key, value) }
-//            }
-//            .build()
-//        val request = Request.Builder()
-//            .url(url)
-//            .apply {
-//                if (token.isNotBlank()) {
-//                    addHeader("Authorization", token)
-//                }
-//            }
-//            .get()
-//            .build()
-//        HttpClient.instance.newCall(request).enqueue(CallbackImpl(doSuccess, doFailure))
-//    }
-
-    // POST表单（HTTPS）
-//    fun postForm(url: String, params: Map<String, String>, callback: Callback) {
-//        val formBody = FormBody.Builder().apply {
-//            params.forEach { (k, v) -> add(k, v) }
-//        }.build()
-//
-//        Request.Builder()
-//            .url(url)
-//            .post(formBody)
-//            .build().let { HttpClient.instance.newCall(it).enqueue(callback) }
-//    }
-
-    // POST JSON（HTTPS）
-    fun postJson(
-        url: String,
-        json: String,
-        doSuccess: (data: Any) -> Unit,
-        doFailure: (code: Int?, msg: String?) -> Unit
-    ) {
-        val body = json
-            .toRequestBody("application/json; charset=utf-8".toMediaTypeOrNull())
-        val token = getToken()
-        Request.Builder()
-            .url(if (url.isHttpApi()) url else UrlConfig.BASE_URL + url)
-            .apply {
-                if (token.isNotBlank()) {
-                    addHeader("X-Access-Token", token)
-                }
-            }
-            .post(body)
-            .build()
-            .let { HttpClient.instance.newCall(it).enqueue(CallbackImpl(doSuccess, doFailure)) }
-    }
-
-
-    val executor = Executors.newSingleThreadScheduledExecutor()
-    var getTokenIsRunning = false
-    private fun exeTokenThread() {
-        if (getTokenIsRunning.not()) {
-            executor.scheduleWithFixedDelay(
-                task, 0, 1, TimeUnit.MINUTES
-            )
-            getTokenIsRunning = true
-        }
-    }
-
-    val task = Runnable {
-        if (BaseApp.token.isNullOrBlank()) {
-            getAppToken()
-        } else {
-            executor.shutdown()
-        }
-    }
-
-    fun getToken() = SpTool.getString(SpTool.TOKEN)
-//BaseApp.instance?.token ?:""
-//BaseApp.getSharedPref()?.getString("token", "") ?: ""
-
-    fun getAppToken() {
-        val url = "${UrlConfig.GET_TOKEN}?qrcodeId=${SpTool.getString(SpTool.DEVICE_ID)}"
-//        Log.d(TAG, "getToken: url = $url")
-        get(url = url, doSuccess = {
-            SpTool.put(SpTool.TOKEN, it)
-            BaseApp.token = it.toString()
-        }) { code, msg ->
-            //toast(msg)
-        }
-    }
-
-    class CallbackImpl(
-        private val doSuccess: (data: Any) -> Unit,
-        private val doFailure: (code: Int?, msg: String?) -> Unit
-    ) :
-        Callback {
-        override fun onFailure(call: Call, e: IOException) {
-            runMainThread {
-                e.printStackTrace()
-                doFailure(-1, "服务异常，${e.message}")
-            }
-        }
-
-        override fun onResponse(call: Call, response: Response) {
-            val respData = response.body?.string()
-            runMainThread {
-                Log.d("HttpUtil", respData ?: "")
-                runCatching {
-                    val typeToken = object : TypeToken<BaseReq<Any>>() {}
-                    val baseReq = respData?.toType<BaseReq<Any>>(typeToken = typeToken)
-                    if (baseReq == null) {
-                        doFailure(-1, "查询数据失败")
-                        return@runCatching
-                    }
-                    if (baseReq.code != 200) {
-                        doFailure(baseReq.code, baseReq.message)
-                        //baseReq.code == 500 ||
-                        if (baseReq.code == 401 && loopGetToken) {
-                            exeTokenThread()
-                        }
-                        return@runCatching
-                    }
-                    doSuccess(baseReq.result ?: "")
-                }.onFailure {
-                    it.printStackTrace()
-                    doFailure(-1, "解析异常")
-                }
-            }
-        }
-
-    }
-
-}
-
-fun String.isHttpApi() = this.startsWith("http://") || this.startsWith("https://")
@@ -1,36 +0,0 @@
-package com.shuwei.dish.match.http
-
-import com.shuwei.dish.match.base.BaseApp
-
-object UrlConfig {
-    private const val DEVICE_BASE_URL = "http://device.shuziweidao.com:8889"
-    /**
-     * device获取token
-     */
-    const val DEVICE_TOKEN = "${DEVICE_BASE_URL}/sys/getEquipmentToken"
-    /**
-     *获取配置信息
-     */
-    const val DEVICE_CONFIG = "${DEVICE_BASE_URL}/equipment/stEquipment/queryByEquipmentCode"
-
-//    const val BASE_URL = "http://vip.shuziweidao.com/shuwei-zhct"
-//    const val DISH_DETAIL = "$BASE_URL/scales/goodsUseList?foodId={foodId}&foodWeight={foodWeight}"
-//    const val DISH_LIST = "$BASE_URL/scales/getRestInfoFoods?eaId=99&type=0&foodName"
-
-//    const val BASE_URL = "http://192.168.1.207:9102"
-    const val BASE_URL = "https://yyjk.shuziweidao.com/gateway"
-//    const val DISH_LIST = "$BASE_URL/scales/getRestInfoFoods?eaId=99&type=0&foodName"
-
-
-    var DISH_DETAIL = "${BaseApp.configUrl}/food/stFoodInfoMatching/queryById"
-
-    // "$BASE_URL/scales/generateToken?deviceId=1111111111111111111111111111"
-
-    var GET_TOKEN = "${BaseApp.configUrl}/restaurant/equipment/stEquipment/getEquipmentToken"
-    var SUBMIT_DISH = "${BaseApp.configUrl}/food/stFoodInfoMatching/saveoredit"
-
-    var QUERY_GOODS_LIST = "${BaseApp.configUrl}/food/stFoodInfoMatching/queryGoodsInfoList"
-    var QUERY_FOOD_LIST = "${BaseApp.configUrl}/food/stFoodInfoMatching/list"
-    var SAMPLING_LIST = "${BaseApp.configUrl}/food/stFoodInfoMatching/queryHistorical/goodsInfoList"
-
-}
@@ -0,0 +1,131 @@
+package com.shuwei.dish.match.net
+
+import com.google.gson.JsonSyntaxException
+import com.shuwei.dish.match.utils.ext.toJsonString
+import com.shuwei.dish.match.utils.ext.toObject
+import com.shuwei.dish.match.utils.ext.toType
+import org.apache.http.conn.ConnectTimeoutException
+import retrofit2.HttpException
+import java.io.IOException
+import java.net.SocketTimeoutException
+import java.net.UnknownHostException
+
+///**
+// * 通用网络请求封装，统一处理异常
+// * @param onRequest 实际的 Retrofit 接口请求
+// * @param onSuccess 成功回调
+// * @param onFailure 自定义错误回调（可选，不传则用默认提示）
+// */
+//suspend fun <T> apiRequest(
+//    onRequest: suspend () -> T,
+//    onSuccess: (T) -> Unit,
+//    onFailure: ((ApiException) -> Unit)? = null
+//) {
+//    try {
+//        // 执行实际的网络请求
+//        val result = onRequest()
+//        onSuccess(result)
+//    } catch (e: Exception) {
+//        val apiException = getApiException(e)
+//        // 优先执行自定义错误回调，没有则用默认提示
+//        if (onFailure != null) {
+//            onFailure(apiException)
+//        } else {
+//            // 默认的错误提示（可根据 ErrorType 定制）
+//            val tip = apiException.errorMsg
+//            // 切换到UI线程弹提示（用 MainScope 确保在主线程）
+//            MainScope().launch {
+//                BaseApp.instance?.toast(tip)
+//            }
+//        }
+//    }
+//}
+
+/**
+ * 通用网络请求封装，统一处理异常
+ * @param onRequest 实际的 Retrofit 接口请求
+ * @param onSuccess 成功回调
+ * @param onFailure 自定义错误回调（可选，不传则用默认提示）
+ */
+@Suppress("UNCHECKED_CAST")
+suspend fun <T> request(
+    onRequest: suspend () -> ApiResponse<T>,
+    onSuccess: (T) -> Unit,
+    onFailure: (String, String) -> Unit
+) {
+    var response: ApiResponse<T>?
+    try {
+        // 执行实际的网络请求
+        response = onRequest()
+    } catch (e: Exception) {
+        val apiException = getApiException(e)
+        onFailure("-1", apiException.errorMsg)
+        return
+    }
+    if (response.isSuccess()) {
+        onSuccess(response.data as T)
+    } else {
+        onFailure(response.code, response.msg ?: "")
+    }
+}
+
+data class CodeMsg(
+    var code: String? = null,
+    var msg: String? = null
+)
+
+@Suppress("DEPRECATION")
+fun getApiException(e: Exception): ApiException {
+    // 捕获各类网络异常并转换为自定义异常
+    return when (e) {
+        is HttpException -> httpException2ApiException(e)
+
+        is JsonSyntaxException -> ApiException(
+            ErrorType.NETWORK_ERROR,
+            errorMsg = "服务器响应异常，请稍后重试"
+        )
+
+        is UnknownHostException -> ApiException(
+            ErrorType.NETWORK_ERROR,
+            errorMsg = "网络未连接，请检查网络"
+        )
+
+        is SocketTimeoutException -> ApiException(
+            ErrorType.TIMEOUT_ERROR,
+            errorMsg = "请求超时，请稍后重试"
+        )
+
+        is ConnectTimeoutException -> ApiException(
+            ErrorType.TIMEOUT_ERROR,
+            errorMsg = "连接超时，请检查网络"
+        )
+
+        is IOException -> ApiException(
+            ErrorType.NETWORK_ERROR,
+            errorMsg = "网络异常：${e.message ?: "未知IO错误"}"
+        )
+
+        is ApiException -> e
+        else -> ApiException(
+            ErrorType.UNKNOWN_ERROR,
+            errorMsg = "未知错误：${e.message ?: "未知"}",
+            throwable = e
+        )
+    }
+}
+
+fun httpException2ApiException(e: HttpException): ApiException {
+    val body = e.response()?.errorBody()?.string()
+    val codeMsg: CodeMsg? = try {
+        body?.toObject<CodeMsg>()
+    } catch (_: Exception) {
+        null
+    }
+    return ApiException(
+        ErrorType.NETWORK_ERROR,
+        errorMsg = if (codeMsg == null) "数据解析异常(${e.code()})"
+                   else codeMsg.msg ?: "服务器错误(${e.code()})"
+    )
+}
+
+
@@ -0,0 +1,113 @@
+package com.shuwei.dish.match.net
+
+import com.shuwei.dish.match.base.GlobalData
+import com.shuwei.dish.match.entity.CookFoodEntity
+import com.shuwei.dish.match.entity.CookFoodGoodsEntity
+import com.shuwei.dish.match.entity.FoodRecord
+import com.shuwei.dish.match.entity.SeasoningEntity
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.POST
+import retrofit2.http.Query
+import retrofit2.http.Url
+
+interface ApiService {
+
+    /**
+     * 查询菜品详情
+     */
+    @GET
+    suspend fun getFoodDetail(
+        @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/matching/app/getConstituteByFoodId",
+        @Query("foodId") foodId: String
+    ): ApiResponse<CookFoodEntity?>
+
+
+    /**
+     * 提交制作菜品
+     */
+    @POST
+    suspend fun submitCookFood(
+        @Url url: String = "${GlobalData.appBaseUrl}/terminal/neglect/matching/app/saveConstitute",
+        @Body param: CookFoodEntity
+    ): ApiResponse<Any?>
+
+    /**
+     * 搜索菜品
+     */
+    @POST
+    suspend fun searchFoodList(
+        @Url url:String = "${GlobalData.appBaseUrl}/terminal/neglect/matching/app/queryPageList",
+        @Body param: MutableMap<String, Any>
+    ): ApiResponse<MutableList<FoodRecord>?>
+
+    /**
+     * 采样数据
+     */
+    @POST
+    suspend fun getSamplingList(
+        @Url url:String = "${GlobalData.appBaseUrl}/terminal/neglect/matching/app/queryHistoryGoodsInfoList",
+        @Body param: MutableMap<String, Any>
+    ): ApiResponse<MutableList<FoodRecord>?>
+
+    /**
+     * 物品信息
+     */
+    @POST
+    suspend fun queryGoodsList(
+        @Url url:String = "${GlobalData.appBaseUrl}/terminal/neglect/matching/app/queryGoodsInfoList",
+        @Body param: MutableMap<String, Any>
+    ): ApiResponse<MutableList<CookFoodGoodsEntity>?>
+
+    /**
+     * 调料信息
+     */
+    @POST
+    suspend fun querySeasoningList(
+        @Url url:String = "${GlobalData.appBaseUrl}/terminal/neglect/matching/app/queryGoodsInfoList",
+        @Body param: MutableMap<String, Any>
+    ): ApiResponse<MutableList<SeasoningEntity>?>
+
+
+
+
+
+
+
+//    /**
+//     *获取配置信息
+//     */
+//    @GET("/equipment/stEquipment/queryByEquipmentCode")
+//    suspend fun getDeviceInfo(
+//        @Query("equipmentCode") equipmentCode: String,
+//        @Query("appVersion") appVersion: String = App.appVersion
+//    ): ApiResponse<DeviceConfigInfo>
+//
+//    @GET
+//    suspend fun getAccessToken(
+//        @Url url: String = UrlConfig.GET_ACCESS_TOKEN,
+//        @Query("qrcodeId") qrcodeId: String
+//    ): ApiResponse<String?>
+//
+//    @GET
+//    suspend fun getShelfList(
+//        @Url url: String = UrlConfig.GET_SHELF_LIST,
+//        @Query("deviceId") deviceId: String
+//    ): ApiResponse<ShelfResult>
+//
+//    @GET
+//    suspend fun getGoodsList(
+//        @Url url: String = UrlConfig.GET_GOODS_LIST,
+//        @Query("canteenId") canteenId: String = "0",
+//        @Query("goodsName") goodsName: String? = null,
+//        @Query("pageNo") pageNo: Int = 1,
+//        @Query("pageSize") pageSize: Int = 50
+//    ): ApiResponse<MutableList<GoodsModel>?>
+//
+//    @POST
+//    suspend fun saveShelfGoodsList(
+//        @Url url: String = UrlConfig.SAVE_SHELF_GOODS_LIST,
+//        @Body body: ShelfBody
+//    ): ApiResponse<Any?>
+
+}
@@ -0,0 +1,19 @@
+package com.shuwei.dish.match.net
+
+// 1. 网络异常类型枚举
+enum class ErrorType {
+    NETWORK_ERROR,        // 网络错误（无网）
+    TIMEOUT_ERROR,        // 超时
+    SERVER_ERROR,         // 服务器错误（5xx）
+    CLIENT_ERROR,         // 客户端错误（4xx）
+    PARSE_ERROR,          // 数据解析错误
+    UNKNOWN_ERROR         // 未知错误
+}
+
+// 2. 自定义网络异常类
+class ApiException(
+    val errorType: ErrorType,
+    val errorCode: Int = -1,
+    val errorMsg: String,
+    val throwable: Throwable? = null
+) : Exception(errorMsg, throwable)
@@ -0,0 +1,40 @@
+//package com.shuwei.dish.match.net
+//
+//import android.annotation.SuppressLint
+//import okhttp3.Interceptor
+//import okhttp3.Response
+//import org.apache.http.conn.ConnectTimeoutException
+//import java.io.IOException
+//import java.net.SocketTimeoutException
+//import java.net.UnknownHostException
+//
+//class ExceptionInterceptor : Interceptor {
+//    @SuppressLint("SuspiciousIndentation")
+//    override fun intercept(chain: Interceptor.Chain): Response {
+//        val request = chain.request()
+//          try {
+//            val response = chain.proceed(request)
+//            // 拦截 HTTP 状态码异常（4xx/5xx）
+//            if (!response.isSuccessful) {
+//                val e = ApiException(
+//                    errorType = if (response.code >= 500) ErrorType.SERVER_ERROR else ErrorType.CLIENT_ERROR,
+//                    errorCode = response.code,
+//                    errorMsg = "HTTP错误：${response.code}"
+//                )
+//                throw e
+//            }
+//            return response
+//        } catch (e: Exception) {
+//            // 捕获各类网络异常并转换为自定义异常
+//            val apiException = when (e) {
+//                is UnknownHostException -> ApiException(ErrorType.NETWORK_ERROR, errorMsg = "网络未连接，请检查网络")
+//                is SocketTimeoutException -> ApiException(ErrorType.TIMEOUT_ERROR, errorMsg = "请求超时，请稍后重试")
+//                is ConnectTimeoutException -> ApiException(ErrorType.TIMEOUT_ERROR, errorMsg = "连接超时，请检查网络")
+//                is IOException -> ApiException(ErrorType.NETWORK_ERROR, errorMsg = "网络异常：${e.message ?: "未知IO错误"}")
+//                is ApiException -> e // 已转换的异常直接抛出
+//                else -> ApiException(ErrorType.UNKNOWN_ERROR, errorMsg = "未知错误：${e.message ?: "未知"}", throwable = e)
+//            }
+//            throw apiException
+//        }
+//    }
+//}
@@ -1,20 +1,38 @@
-package com.shuwei.dish.match.http
+package com.shuwei.dish.match.net

 import android.annotation.SuppressLint
 import android.util.Log
-import okhttp3.Call
-import okhttp3.Interceptor
+import com.shuwei.dish.match.base.GlobalData
 import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
+import okhttp3.logging.HttpLoggingInterceptor
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
 import java.util.concurrent.TimeUnit

 import javax.net.ssl.*
 import java.security.SecureRandom
 import java.security.cert.X509Certificate
+import kotlin.apply
+import kotlin.jvm.java

-class HttpClient private constructor() {
-    private val client: OkHttpClient by lazy {
+val apiService: ApiService = Retrofit.Builder()
+    .baseUrl(GlobalData.appBaseUrl)
+//    .baseUrl(UrlConfig.DEVICE_BASE_URL)
+    .client(HttpManager.instance.client)
+    .addConverterFactory(GsonConverterFactory.create())
+    .build()
+    .create(ApiService::class.java)
+
+//val apiService2: ApiService2 = Retrofit.Builder()
+//    .baseUrl(UrlConfig.BASE_URL)
+////    .baseUrl(UrlConfig.DEVICE_BASE_URL)
+//    .client(HttpManager.instance.client)
+//    .addConverterFactory(GsonConverterFactory.create())
+//    .build()
+//    .create(ApiService2::class.java)
+
+class HttpManager private constructor() {
+    val client: OkHttpClient by lazy {
        OkHttpClient.Builder()
            .apply {
                connectTimeout(15, TimeUnit.SECONDS)
@@ -22,40 +40,32 @@ class HttpClient private constructor() {
                writeTimeout(15, TimeUnit.SECONDS)
                sslSocketFactory(createSSLSocketFactory(), TrustAllCerts())
                hostnameVerifier { _, _ -> true }
-                //if (BuildConfig.Debug) {
-                    addInterceptor(LoggingInterceptor())
-               //   }
+                addNetworkInterceptor(HttpLoggingInterceptor(logger = {
+                    Log.d("HttpManager", "okhttp logger ==>${it}")
+                }).also {
+                    it.level = HttpLoggingInterceptor.Level.BODY
+                })
+                addInterceptor(RequestInterceptor())
+//                addInterceptor(ExceptionInterceptor())
            }
            .build()
    }

    companion object {
-        val instance by lazy { HttpClient() }
-    }
-
-    fun newCall(request: Request): Call = client.newCall(request)
-
-    inner class LoggingInterceptor : Interceptor {
-        override fun intercept(chain: Interceptor.Chain): Response {
-            val request = chain.request()
-            // 打印请求日志
-            Log.d("OkHttp", "--> ${request.method} ${request.url}")
-
-            val response = chain.proceed(request)
-            // 打印响应日志
-            Log.d("OkHttp", "<-- ${response.code} ${response.request.url}")
-
-            return response
-        }
+        val instance by lazy { HttpManager() }
    }

    // 信任所有证书的TrustManager实现
    @SuppressLint("CustomX509TrustManager")
    class TrustAllCerts : X509TrustManager {
        @SuppressLint("TrustAllX509TrustManager")
-        override fun checkClientTrusted(chain: Array<X509Certificate>, authType: String) {}
+        override fun checkClientTrusted(chain: Array<X509Certificate>, authType: String) {
+        }
+
        @SuppressLint("TrustAllX509TrustManager")
-        override fun checkServerTrusted(chain: Array<X509Certificate>, authType: String) {}
+        override fun checkServerTrusted(chain: Array<X509Certificate>, authType: String) {
+        }
+
        override fun getAcceptedIssuers(): Array<X509Certificate> = arrayOf()
    }

@@ -0,0 +1,120 @@
+package com.shuwei.dish.match.net
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.shuwei.dish.match.entity.CookFoodEntity
+import com.shuwei.dish.match.entity.CookFoodGoodsEntity
+import com.shuwei.dish.match.entity.FoodRecord
+import com.shuwei.dish.match.entity.SeasoningEntity
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+
+/**
+ * 网络请求 ViewModel，所有网络操作通过 RemoteRepository 发起，不直接依赖 apiService
+ * @param repository 网络数据仓库，默认使用单例实例
+ */
+class NetViewModel(
+    private val repository: RemoteRepository = RemoteRepository()
+) : ViewModel() {
+
+    /**
+     * 提交制作菜品的 UI 状态流，UI 层通过 collect 监听
+     */
+    private val _submitCookFoodState = MutableStateFlow<UiState<Any?>>(UiState.Idle)
+    val submitCookFoodState: StateFlow<UiState<Any?>> = _submitCookFoodState.asStateFlow()
+
+    /**
+     * 提交制作菜品
+     */
+    fun submitCookFood(entity: CookFoodEntity) {
+        viewModelScope.launch {
+            _submitCookFoodState.value = UiState.Loading
+            _submitCookFoodState.value = repository.submitCookFood(entity)
+        }
+    }
+
+    /**
+     * 查询菜品详情的 UI 状态流，UI 层通过 collect 监听
+     */
+    private val _foodDetailState = MutableStateFlow<UiState<CookFoodEntity?>>(UiState.Idle)
+    val foodDetailState: StateFlow<UiState<CookFoodEntity?>> = _foodDetailState.asStateFlow()
+
+    /**
+     * 查询菜品详情
+     */
+    fun getFoodDetail(foodId: String) {
+        viewModelScope.launch {
+            _foodDetailState.value = UiState.Loading
+            _foodDetailState.value = repository.getFoodDetail(foodId)
+        }
+    }
+
+    /**
+     * 搜索菜品列表的 UI 状态流，UI 层通过 collect 监听
+     */
+    private val _searchFoodState = MutableStateFlow<UiState<MutableList<FoodRecord>?>>(UiState.Idle)
+    val searchFoodState: StateFlow<UiState<MutableList<FoodRecord>?>> = _searchFoodState.asStateFlow()
+
+    /**
+     * 搜索菜品列表
+     */
+    fun searchFoodList(param: MutableMap<String, Any>) {
+        viewModelScope.launch {
+            _searchFoodState.value = UiState.Loading
+            _searchFoodState.value = repository.searchFoodList(param)
+        }
+    }
+
+    /**
+     * 查询采样数据列表的 UI 状态流，UI 层通过 collect 监听
+     */
+    private val _samplingListState = MutableStateFlow<UiState<MutableList<FoodRecord>?>>(UiState.Idle)
+    val samplingListState: StateFlow<UiState<MutableList<FoodRecord>?>> = _samplingListState.asStateFlow()
+    fun resetSamplingListState() {
+        _samplingListState.value = UiState.Idle
+    }
+
+    /**
+     * 查询采样数据列表
+     */
+    fun getSamplingList(param: MutableMap<String, Any>) {
+        viewModelScope.launch {
+            _samplingListState.value = UiState.Loading
+            _samplingListState.value = repository.getSamplingList(param)
+        }
+    }
+
+    /**
+     * 查询物品信息列表的 UI 状态流，UI 层通过 collect 监听
+     */
+    private val _goodsListState = MutableStateFlow<UiState<MutableList<CookFoodGoodsEntity>?>>(UiState.Idle)
+    val goodsListState: StateFlow<UiState<MutableList<CookFoodGoodsEntity>?>> = _goodsListState.asStateFlow()
+
+    /**
+     * 查询物品信息列表
+     */
+    fun queryGoodsList(param: MutableMap<String, Any>) {
+        viewModelScope.launch {
+            _goodsListState.value = UiState.Loading
+            _goodsListState.value = repository.queryGoodsList(param)
+        }
+    }
+
+    /**
+     * 查询调料信息列表的 UI 状态流，UI 层通过 collect 监听
+     */
+    private val _seasoningListState = MutableStateFlow<UiState<MutableList<SeasoningEntity>?>>(UiState.Idle)
+    val seasoningListState: StateFlow<UiState<MutableList<SeasoningEntity>?>> = _seasoningListState.asStateFlow()
+
+    /**
+     * 查询调料信息列表
+     */
+    fun querySeasoningList(param: MutableMap<String, Any>) {
+        viewModelScope.launch {
+            _seasoningListState.value = UiState.Loading
+            _seasoningListState.value = repository.querySeasoningList(param)
+        }
+    }
+}
@@ -0,0 +1,111 @@
+package com.shuwei.dish.match.net
+
+import com.shuwei.dish.match.entity.CookFoodEntity
+import com.shuwei.dish.match.entity.CookFoodGoodsEntity
+import com.shuwei.dish.match.entity.FoodRecord
+import com.shuwei.dish.match.entity.SeasoningEntity
+
+/**
+ * 网络数据仓库，封装所有 ApiService 调用
+ * ViewModel 不直接接触 apiService，统一通过此类发起网络请求
+ */
+class RemoteRepository {
+
+    /**
+     * 提交制作菜品
+     * @param entity 菜品实体
+     * @return UiState 包装的结果，Success 表示提交成功，Error 携带错误信息
+     */
+    suspend fun submitCookFood(entity: CookFoodEntity): UiState<Any?> {
+        return try {
+            val resp = apiService.submitCookFood(param = entity)
+            if (resp.isSuccess()) UiState.Success(resp.data)
+            else UiState.Error(resp.code, resp.msg ?: "")
+        } catch (e: Exception) {
+            val ex = getApiException(e)
+            UiState.Error("-1", ex.errorMsg)
+        }
+    }
+
+    /**
+     * 查询菜品详情
+     * @param foodId 菜品 ID
+     * @return UiState 包装的结果，Success 携带详情数据，Error 携带错误信息
+     */
+    suspend fun getFoodDetail(foodId: String): UiState<CookFoodEntity?> {
+        return try {
+            val resp = apiService.getFoodDetail(foodId = foodId)
+            if (resp.isSuccess()) UiState.Success(resp.data)
+            else UiState.Error(resp.code, resp.msg ?: "")
+        } catch (e: Exception) {
+            val ex = getApiException(e)
+            UiState.Error("-1", ex.errorMsg)
+        }
+    }
+
+    /**
+     * 搜索菜品列表
+     * @param param 查询参数
+     * @return UiState 包装的结果，Success 携带列表数据，Error 携带错误信息
+     */
+    suspend fun searchFoodList(param: MutableMap<String, Any>): UiState<MutableList<FoodRecord>?> {
+        return try {
+            val resp = apiService.searchFoodList(param = param)
+            if (resp.isSuccess()) UiState.Success(resp.data)
+            else UiState.Error(resp.code, resp.msg ?: "")
+        } catch (e: Exception) {
+            val ex = getApiException(e)
+            UiState.Error("-1", ex.errorMsg)
+        }
+    }
+
+    /**
+     * 查询采样数据列表
+     * @param param 查询参数
+     * @return UiState 包装的结果，Success 携带列表数据，Error 携带错误信息
+     */
+    suspend fun getSamplingList(param: MutableMap<String, Any>): UiState<MutableList<FoodRecord>?> {
+        return try {
+            val resp = apiService.getSamplingList(param = param)
+            if (resp.isSuccess()) UiState.Success(resp.data)
+            else UiState.Error(resp.code, resp.msg ?: "")
+        } catch (e: Exception) {
+            val ex = getApiException(e)
+            UiState.Error("-1", ex.errorMsg)
+        }
+    }
+
+    /**
+     * 查询物品信息列表
+     * @param param 查询参数
+     * @return UiState 包装的结果，Success 携带列表数据，Error 携带错误信息
+     */
+    suspend fun queryGoodsList(param: MutableMap<String, Any>): UiState<MutableList<CookFoodGoodsEntity>?> {
+        return try {
+            val resp = apiService.queryGoodsList(param = param)
+            if (resp.isSuccess()) UiState.Success(resp.data)
+            else UiState.Error(resp.code, resp.msg ?: "")
+        } catch (e: Exception) {
+            val ex = getApiException(e)
+            UiState.Error("-1", ex.errorMsg)
+        }
+    }
+
+
+    /**
+     * 查询调料信息列表
+     * @param param 查询参数
+     * @return UiState 包装的结果，Success 携带列表数据，Error 携带错误信息
+     */
+    suspend fun querySeasoningList(param: MutableMap<String, Any>): UiState<MutableList<SeasoningEntity>?> {
+        return try {
+            val resp = apiService.querySeasoningList(param = param)
+            if (resp.isSuccess()) UiState.Success(resp.data)
+            else UiState.Error(resp.code, resp.msg ?: "")
+        } catch (e: Exception) {
+            val ex = getApiException(e)
+            UiState.Error("-1", ex.errorMsg)
+        }
+    }
+
+}
@@ -0,0 +1,22 @@
+package com.shuwei.dish.match.net
+
+import com.shuwei.dish.match.base.GlobalData
+import okhttp3.Interceptor
+import okhttp3.Response
+
+/**
+ * 请求拦截器
+ */
+class RequestInterceptor : Interceptor {
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val originalRequest = chain.request()
+        val requestBuilder = originalRequest.newBuilder()
+            .header("X-Access-Token", "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJjYW50ZWVuSWQiOiJiZTE1NDgzMS0zNDY2LTNiYTItYTJlYS01NzY1MmM5MTlmZWQiLCJ0eXBlIjoiNCIsInVzZXJJZCI6IjAwMDAwMDAwMDAwMDAwMDAwMDEifQ.sN40cOC-O5WQFrF4IDUs8fFlkNdUKLbJt_rHyTsgYYM")
+            .header("X-DEVICE-CODE", GlobalData.deviceId)
+            .header("authorization", "57ee87183f2a4fa59683ec9ef41c8f5d")
+
+        val newRequest = requestBuilder.build()
+
+        return chain.proceed(newRequest)
+    }
+}
@@ -0,0 +1,9 @@
+package com.shuwei.dish.match.net
+
+data class ApiResponse<T>(
+    val code: String,
+    val msg: String? = "",
+    val data: T? = null
+) {
+    fun isSuccess() = code == "00000"
+}
@@ -0,0 +1,15 @@
+package com.shuwei.dish.match.net
+
+/**
+ * 统一 UI 状态模型，用于 ViewModel 向 UI 层传递请求状态
+ * Idle    — 初始状态，未发起请求
+ * Loading — 请求进行中
+ * Success — 请求成功，携带数据
+ * Error   — 请求失败，携带错误码和错误信息
+ */
+sealed class UiState<out T> {
+    object Idle : UiState<Nothing>()
+    object Loading : UiState<Nothing>()
+    data class Success<T>(val data: T) : UiState<T>()
+    data class Error(val code: String, val msg: String) : UiState<Nothing>()
+}
@@ -0,0 +1,68 @@
+package com.shuwei.dish.match.objbox
+
+import android.graphics.Bitmap
+import android.net.Uri
+import java.io.File
+
+data class FoodClassInfo(
+    var class_names: List<String>,
+    var class_to_idx: Map<String, Int>,
+    var idx_to_class: Map<String, String>
+)
+
+data class FoodCollectionBean(
+    var imageUri: Uri? = null,
+    var bitmap: Bitmap? = null,
+    var imageFile: File? = null,
+    var imageVector: FloatArray? = null,
+    var isShowCamera: Boolean = false,
+    var isFinish:Boolean = false,
+    var uploadSuccess:Boolean = false
+)
+
+data class ReceiptGoodsInfo(
+    var goodsId: String? = "",
+    var goodsName: String? = "",
+    var procurementUnit: String? = "",
+    var procurementCount: Int? = 0,
+    var procurementPrice: Double? = 0.0,
+    var procurementAmount: Double? = 0.0,
+    var receiptCount: Int? = 0,
+    var goodsWeight: Int? = 0,
+    var goodsState: String? = "",
+    var isSelected: Boolean = false,
+    var isLocalGoods: Boolean = false
+)
+
+//data class DropdownInfo(
+//    var id: String,
+//    var name: String
+//)
+
+//data class RecognizeResult(
+//    var name: String? = null,
+//    var image: String? = null,
+//    var isSelected: Boolean = false
+//)
+
+//data class GoodsSearchInfo(
+//    var id: String? = null,
+//    var name: String? = null,
+//    var isSelected: Boolean = false
+//)
+
+data class OperateBean(
+    var obj: Any? = null,
+    var typeList: MutableList<OperateType> = mutableListOf(),
+    var isSelected: Boolean = false,
+    var isLocalGoods: Boolean = false,
+    var isReceiptPage: Boolean = true
+)
+
+data class OperateType(
+    var value: String = "",
+    var width: Int = 0,
+    var textColor: String = "#FF999999",
+    var isBoldFont: Boolean = false,
+    var isShowIcon: Boolean = false
+)
@@ -0,0 +1,37 @@
+package com.shuwei.dish.match.objbox
+
+import io.objectbox.annotation.Entity
+import io.objectbox.annotation.HnswIndex
+import io.objectbox.annotation.Id
+import io.objectbox.annotation.VectorDistanceType
+
+@Entity
+data class Food(
+    @Id var id: Long = 0,
+    var name: String? = null,
+    var foodIdx: Int = 0,
+    @HnswIndex(dimensions = 512, distanceType = VectorDistanceType.DOT_PRODUCT)
+    var foodVector: FloatArray? = null
+) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as Food
+
+        if (id != other.id) return false
+        if (foodIdx != other.foodIdx) return false
+        if (name != other.name) return false
+        if (!foodVector.contentEquals(other.foodVector)) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = id.hashCode()
+        result = 31 * result + foodIdx
+        result = 31 * result + (name?.hashCode() ?: 0)
+        result = 31 * result + (foodVector?.contentHashCode() ?: 0)
+        return result
+    }
+}
@@ -0,0 +1,308 @@
+package com.shuwei.dish.match.objbox
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.util.Log
+import androidx.core.graphics.scale
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import com.shuwei.dish.match.utils.AssetsTool
+import com.shuwei.dish.match.utils.LogSaveUtil
+import com.shuwei.dish.match.utils.ext.toJsonString
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.pytorch.IValue
+import org.pytorch.Module
+import org.pytorch.torchvision.TensorImageUtils
+import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
+import java.io.InputStream
+
+
+object FoodModule {
+
+    private lateinit var module_mobile: Module
+
+    private val NO_MEAN_RGB = floatArrayOf(0.0f, 0.0f, 0.0f)
+    private val NO_STD_RGB = floatArrayOf(1.0f, 1.0f, 1.0f)
+
+    // 1. 定义你的模型固定输入尺寸 (根据你的tflite模型修改，比如224x224)
+    private const val MODEL_INPUT_WIDTH = 300
+    private const val MODEL_INPUT_HEIGHT = 300
+    const val DEFAULT_FOOD_INDEX = -1
+    const val DEFAULT_QUERY_COUNT = 50
+
+    const val BAG_RATE = 0.05
+
+    suspend fun init(context: Context) {
+        withContext(Dispatchers.IO) {
+            module_mobile = Module.load(copyAssetToCache(context, "best_embedding_model_mobile.pt"))
+            initDefFoodData(context)
+        }
+    }
+
+//    fun uri2FloatArray(uri: Uri): FloatArray? {
+//        return MyApp.instance?.let { context ->
+//            ImageUtil.uriToBitmap(context, uri)?.let {
+//                bitmap2FloatArray(it)
+//            }
+//        }
+//    }
+
+    fun bitmap2FloatArray(originBitmap: Bitmap, isRecycle: Boolean): FloatArray? {
+        var rgb565Bitmap: Bitmap? = null
+        try {
+            val scaledBitmap = originBitmap.scale(MODEL_INPUT_WIDTH, MODEL_INPUT_HEIGHT)
+            if (isRecycle) {
+                originBitmap.recycle()
+            }
+            rgb565Bitmap = scaledBitmap.copy(Bitmap.Config.RGB_565, false)
+            scaledBitmap.recycle()
+            val inputTensor = TensorImageUtils.bitmapToFloat32Tensor(
+                rgb565Bitmap,
+                NO_MEAN_RGB, // [0.485, 0.456, 0.406] TORCHVISION_NORM_MEAN_RGB
+                NO_STD_RGB    // [0.229, 0.224, 0.225] TORCHVISION_NORM_STD_RGB
+            )
+            val outputTensor = module_mobile.forward(IValue.from(inputTensor)).toTensor()
+            return outputTensor.dataAsFloatArray
+        } catch (e: OutOfMemoryError) {
+            e.printStackTrace()
+            logInfo("bitmap2FloatArray异常:${e.message}")
+        } finally {
+            if (rgb565Bitmap != null && rgb565Bitmap.isRecycled.not()) {
+                rgb565Bitmap.recycle()
+            }
+            //System.gc()
+            //System.runFinalization()
+        }
+        return null
+    }
+
+//    fun queryFood(uri: Uri, queryCount: Int = DEFAULT_QUERY_COUNT): List<String>? {
+//        return uri2FloatArray(uri)?.let {
+//            queryFood(it, queryCount)
+//        }
+//    }
+
+//    /**
+//     * 返回识别物品名称列表
+//     */
+//    fun queryFood(bitmap: Bitmap, queryCount: Int = DEFAULT_QUERY_COUNT): List<String> {
+//        val floatArray = bitmap2FloatArray(bitmap)
+//        return queryFood(floatArray, queryCount)
+//    }
+
+//    /**
+//     * 返回识别物品IdNameScore对象列表
+//     */
+//    fun queryFoodNameScore(bitmap: Bitmap, queryCount: Int = DEFAULT_QUERY_COUNT): List<IdNameScore> {
+//        val floatArray = bitmap2FloatArray(bitmap)
+//        return queryFoodNameScore(floatArray, queryCount)
+//    }
+
+    suspend fun queryFoodNameScore(
+        floatArray: FloatArray?,
+        queryCount: Int = DEFAULT_QUERY_COUNT
+    ): List<IdNameScore> {
+        if (floatArray == null) return emptyList()
+//        val query: Query<Food> = box.query(Food_.foodVector.nearestNeighbors(floatArray, queryCount)).build()
+//        //查询比较分数
+////        val tempList = query.findWithScores().sortedBy { it.score }.map { "${it.get().name}|${it.get().foodIdx}|${it.score}" }
+//        var idScoreList: List<IdWithScore>
+//        try {
+//            idScoreList = query.findIdsWithScores();
+//        } finally {
+//            // 先关闭Query，释放Cursor
+//            query.close()
+//        }
+
+        logInfo("queryFood向量：${floatArray.slice(0 until 50).toJsonString()}")
+        val idScoreList = ObjectBox.query(floatArray, queryCount)
+        // 批量加载所有实体，一次DB操作替代循环单条查询
+        val foodMap = ObjectBox.getByIds(idScoreList.map { it.id }).associateBy { it.id }
+        val nameScoreList = mutableListOf<IdNameScore>()
+        idScoreList.forEach {
+            val name = foodMap[it.id]?.name ?: ""
+            nameScoreList.add(IdNameScore(id = it.id, name = name, score = it.score))
+        }
+        logInfo("queryFood数据：${nameScoreList.toJsonString()}")
+        return nameScoreList
+    }
+
+    suspend fun getFoodScoreList(bitmap: Bitmap, queryCount: Int = DEFAULT_QUERY_COUNT): List<IdNameScore> {
+        val floatArray = bitmap2FloatArray(bitmap, false) ?: return emptyList()
+        logInfo("getFoodScoreList向量：${floatArray.toJsonString()}")
+        val nameScoreList = queryFoodNameScore(floatArray, queryCount)
+        if (nameScoreList.isEmpty()) {
+            return emptyList()
+        }
+        //暂时不过滤
+        val maxScoreList = nameScoreList
+            //.filter { it.score < 0.15 }
+            .groupBy { it.name }
+            .map { (_, value) -> value.minByOrNull { it.score }!! }
+            .toMutableList()
+//        val map = mutableMapOf<String, Int>()
+//        nameScoreList.forEach {
+//            val key = it.name
+//            val count = map[key] ?: 0
+//            map[key] = count + 1
+//        }
+//        val orderList = map.entries.sortedByDescending { it.value }.map { it.key }.toMutableList()
+//        val firstFood = nameScoreList[0].name
+//        orderList.remove(firstFood)
+//        orderList.add(0, firstFood)
+//
+//        val sortedScoreList = maxScoreList.sortedWith(compareBy {
+//            orderList.indexOf(it.name)
+//        })
+        val sortedScoreList = maxScoreList.sortedBy { it.score }
+        logInfo("getFoodScoreList数据：${sortedScoreList.toJsonString()}")
+        return sortedScoreList
+    }
+
+//    suspend fun queryFood(floatArray: FloatArray, queryCount: Int = DEFAULT_QUERY_COUNT): List<String> {
+//        val map = mutableMapOf<String, Int>()
+//        val nameScoreList = queryFoodNameScore(floatArray, queryCount)
+//        nameScoreList.filter { it.score < 0.05 }.forEach {
+//            val count = map[it.name] ?: 0
+//            map[it.name] = count + 1
+//        }
+//        val list = map.entries.sortedByDescending { it.value }.map { it.key }
+//        return list
+//    }
+
+    data class IdNameScore(
+        val id: Long,
+        var name: String,
+        val score: Double
+    )
+
+    suspend fun initDefFoodData(context: Context, action: () -> Unit = {}) {
+        try {
+            val count = ObjectBox.countIndexField(DEFAULT_FOOD_INDEX)
+            if (count > 0) {
+                return
+            }
+            val embeddingsJson = AssetsTool.readAssetsFile(context, "data/embeddings.json")
+            val labelsJson = AssetsTool.readAssetsFile(context, "data/labels.json")
+            val classInfoJson = AssetsTool.readAssetsFile(context, "data/class_info.json")
+
+            val embeddingsList: List<List<Float>> =
+                Gson().fromJson(embeddingsJson, object : TypeToken<List<List<Float>>>() {}.type)
+            val labelsList: IntArray = Gson().fromJson(labelsJson, IntArray::class.java)
+            val classInfo: FoodClassInfo =
+                Gson().fromJson(classInfoJson, FoodClassInfo::class.java)
+
+            val foodMap = classInfo.idx_to_class
+            val list = mutableListOf<Food>()
+            val size = embeddingsList.size
+            val size2 = labelsList.size
+            val size3 = foodMap.size
+            logInfo("initDefFoodData: $size,$size2,$size3")
+            embeddingsList.forEachIndexed { index, floatList ->
+                val classIdx = labelsList[index]
+                val foodName = foodMap["$classIdx"]
+                val array = floatList.toFloatArray()
+                //            ObjectBox.boxStore.runInTx {
+                //                box.put(Food(name = foodName, foodVector = array, foodIdx = DEFAULT_FOOD_INDEX))
+                //            }
+                val food = Food(name = foodName, foodVector = array, foodIdx = DEFAULT_FOOD_INDEX)
+                list.add(food)
+            }
+//                val tempList = list.chunked(10)
+            ObjectBox.putAll(list)
+            action()
+        } catch (e: Exception) {
+            e.printStackTrace()
+            logInfo("initDefFoodData: ---${e.message}--")
+        }
+    }
+
+
+    /**
+     * ，此方法的主要目的是：从assets 拷贝到 app的cache目录
+     * @param context
+     * @param fileName
+     * @return  例如是这样：/data/user/0/com.frizzle.pluginhookandroid9/cache/plugin-debug.apk
+     *
+     * 不可能反正SD
+     */
+//    fun copyAssetToCache(context: Context, fileName: String): String? {
+//        //  此app的缓存目录 --> 会默认在 cache目录...，可以自己去看看哦
+//        val cacheDir = context.getCacheDir()
+//        if (!cacheDir.exists()) {
+//            cacheDir.mkdirs() // TODO 如果没有缓存目录，就创建
+//        }
+//        val outPath = File(cacheDir, fileName) // TODO 创建输出的文件位置
+//        if (outPath.exists()) {
+//            outPath.delete() // TODO 如果该文件已经存在，就删掉
+//        }
+//        var `is`: InputStream? = null // 读取
+//        var fos: FileOutputStream? = null // 写入
+//        try {
+//            // 创建文件，如果创建成功，就返回true
+//            val res = outPath.createNewFile()
+//            if (res) {
+//                `is` = context.getAssets().open(fileName) // 拿到main/assets目录的输入流，用于读取字节
+//                fos = FileOutputStream(outPath) // 读取出来的字节最终写到outPath
+//                val buf = ByteArray(`is`.available()) // 缓存区
+//                var byteCount: Int
+//
+//                // 开始循环读取
+//                while ((`is`.read(buf).also { byteCount = it }) != -1) {
+//                    fos.write(buf, 0, byteCount)
+//                }
+//                return outPath.getAbsolutePath()
+//            }
+//        } catch (e: IOException) {
+//            e.printStackTrace()
+//        } finally {
+//            try {
+//                // TODO  一定要记得关闭资源，为了不去性能的磨损
+//                fos?.flush()
+//                `is`?.close()
+//                fos?.close()
+//            } catch (e: IOException) {
+//                e.printStackTrace()
+//            }
+//        }
+//        return null
+//    }
+
+    fun copyAssetToCache(context: Context, fileName: String): String? {
+        val cacheFile = File(context.cacheDir, fileName)
+        val buffer = ByteArray(8 * 1024)
+        var inputStream: InputStream? = null
+        var outputStream: FileOutputStream? = null
+
+        try {
+            inputStream = context.assets.open(fileName)
+            outputStream = FileOutputStream(cacheFile)
+            var byteCount: Int
+            while (inputStream.read(buffer).also { byteCount = it } != -1) {
+                outputStream.write(buffer, 0, byteCount)
+            }
+            outputStream.channel.force(true) // 强制物理落盘，比flush更彻底
+            return cacheFile.absolutePath
+        } catch (e: IOException) {
+            e.printStackTrace()
+            logInfo("文件拷贝失败 fileName=$fileName, error=${e.message}")
+            // 拷贝失败时删除残缺文件，避免下次读取到损坏文件
+            if (cacheFile.exists()) {
+                cacheFile.delete()
+            }
+        } finally {
+            outputStream?.close()
+            inputStream?.close()
+        }
+        return null
+    }
+
+    private fun logInfo(msg:String) {
+        Log.d("FoodModule", msg)
+        LogSaveUtil.saveLogFile(msg)
+    }
+
+}
@@ -0,0 +1,327 @@
+/*
+ * Copyright 2024 ObjectBox Ltd. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.shuwei.dish.match.objbox
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.util.Log
+import com.shuwei.dish.match.base.BaseApp
+import com.shuwei.dish.match.utils.LogSaveUtil
+import io.objectbox.Box
+import io.objectbox.BoxStore
+import io.objectbox.BoxStoreBuilder
+import io.objectbox.exception.DbException
+import io.objectbox.exception.FileCorruptException
+import io.objectbox.kotlin.boxFor
+import io.objectbox.query.Query
+import io.objectbox.sync.Sync
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import java.io.File
+import java.io.FileInputStream
+import java.io.FileOutputStream
+import java.io.IOException
+import java.util.zip.GZIPOutputStream
+import com.shuwei.dish.match.BuildConfig
+
+/**
+ * Singleton to keep BoxStore reference and provide current list of Notes Objects.
+ * Inserts demo data if no Objects are stored.
+ */
+object ObjectBox {
+
+//    确保所有设备/版本使用相同的objectbox-models/default.json
+//    避免直接修改自动生成的MyObjectBox类
+//    跨版本升级时使用boxStore.runInTx执行数据迁移
+
+    private const val TAG = "ObjectBox"
+
+    // 添加 @Volatile 保证多线程下的可见性
+    @Volatile
+    var boxStore: BoxStore? = null
+
+    /**
+     * If building the [boxStore] failed, contains the thrown error message.
+     */
+    var dbExceptionMessage: String? = null
+        private set
+
+    fun init(context: Context) {
+        if (boxStore != null && boxStore!!.isClosed.not()) return
+        // 优化：调大事务回收超时时间
+        System.setProperty("objectbox.finalizerTimeout", "30000");
+        // On Android make sure to pass a Context when building the Store.
+        boxStore = try {
+            MyObjectBox.builder()
+                .androidContext(context.applicationContext)
+                //.disableMultiProcess() // 开启多进程支持（按需关闭，单进程可删）
+                //.disableFileCompression() // 禁用文件压缩，避免存储异常
+                .build()
+        } catch (e: DbException) {
+            if (e.javaClass == DbException::class.java || e is FileCorruptException) {
+                // Failed to build BoxStore due to database file issue, store message;
+                // checked in NoteListActivity to notify user.
+                dbExceptionMessage = e.toString()
+                LogSaveUtil.saveLogFile("ObjectBox.init异常1:$dbExceptionMessage")
+                return
+            } else {
+                LogSaveUtil.saveLogFile("ObjectBox.init异常2:${e.message}")
+                // Failed to build BoxStore due to developer error.
+                throw e
+            }
+        }
+
+        if (BuildConfig.DEBUG) {
+            var syncAvailable = if (Sync.isAvailable()) "available" else "unavailable"
+            Log.d(
+                TAG,
+                "Using ObjectBox ${BoxStore.getVersion()} (${BoxStore.getVersionNative()}, sync $syncAvailable)"
+            )
+            // Enable ObjectBox Admin on debug builds.
+            // https://docs.objectbox.io/data-browser
+            io.objectbox.android.Admin(boxStore).start(context.applicationContext)
+        }
+    }
+
+
+    /**
+     * If the database file is not in use, compresses (GZIP) and copies it to the given [target].
+     * 增加 IOException 捕获，避免文件异常导致崩溃。
+     */
+    fun copyAndGzipDatabaseFileTo(target: File, context: Context): Boolean {
+        if (BoxStore.isDatabaseOpen(context, null)) {
+            // Do not copy if database file is still in use.
+            // If it would be open, the copy will likely get corrupted
+            // as BoxStore may currently write data to the file.
+            Log.e(TAG, "Database file is still in use, can not copy.")
+            return false
+        }
+
+        // If a name was given when building BoxStore use that instead of the default below.
+        val dbName = BoxStoreBuilder.DEFAULT_NAME
+        return try {
+            File(context.filesDir, "objectbox/$dbName/data.mdb").inputStream().use { input ->
+                target.parentFile?.mkdirs()
+                GZIPOutputStream(target.outputStream()).use { output ->
+                    input.copyTo(output, DEFAULT_BUFFER_SIZE)
+                }
+            }
+            true
+        } catch (e: IOException) {
+            Log.e(TAG, "备份数据库文件失败", e)
+            false
+        }
+    }
+
+
+    // 获取指定实体的Box，自动关联BoxStore
+    inline fun <reified T> getBox(): Box<T>? = boxStore?.boxFor()
+
+    // 协程安全执行数据库操作（推荐所有操作使用此方法）
+    suspend fun <T> safeDbOp(operation: suspend () -> T): T? {
+        return withContext(Dispatchers.IO) {
+            try {
+                dbMutex.withLock { operation() }
+            } catch (e: FileCorruptException) {
+                // 操作中触发损坏，尝试重建数据库
+                e.printStackTrace()
+                LogSaveUtil.saveLogFile("safeDbOp出现FileCorruptException异常:${e.message},${e.errorCode}")
+                // 使用安全调用替代 !! 断言，避免 NPE
+                val app = BaseApp.instance ?: return@withContext null
+                init(app)
+                null
+            } catch (e: Exception) {
+                e.printStackTrace()
+                LogSaveUtil.saveLogFile("safeDbOp出现其它异常:${e.message}")
+                null
+            } finally {
+                // 线程资源清理
+                boxStore?.closeThreadResources()
+            }
+        }
+    }
+
+    suspend fun query(floatArray: FloatArray, queryCount: Int) = safeDbOp {
+        val query: Query<Food>? = getBox<Food>()?.query(
+            Food_.foodVector
+                .nearestNeighbors(floatArray, queryCount)
+        )?.build()
+        try {
+            query?.findIdsWithScores()
+        } finally {
+            // 先关闭Query，释放Cursor
+            query?.close()
+        }
+    } ?: emptyList()
+
+    suspend fun get(id: Long) = safeDbOp {
+        getBox<Food>()?.get(id)
+    }
+
+    // 批量按ID加载，一次DB事务替代循环单条查询
+    suspend fun getByIds(ids: List<Long>): List<Food> = safeDbOp {
+        if (ids.isEmpty()) return@safeDbOp emptyList<Food>()
+        getBox<Food>()?.get(ids.toLongArray()) ?: emptyList<Food>()
+    } ?: emptyList()
+
+    suspend fun put(entity: Food) = safeDbOp {
+        getBox<Food>()?.put(entity)
+    }
+
+    suspend fun putAll(entities: List<Food>) = safeDbOp {
+        val box = getBox<Food>()
+        box?.put(entities)
+    }
+
+    // 使用 QueryBuilder 在数据库层计数，避免全量加载到内存
+    suspend fun countNameField(name: String) = safeDbOp {
+        getBox<Food>()?.query(Food_.name.equal(name))?.build()?.count()
+    } ?: 0L
+
+    suspend fun countIndexField(idx: Int) = safeDbOp {
+        getBox<Food>()?.query(Food_.foodIdx.equal(idx))?.build()?.count()
+    } ?: 0L
+
+    // 使用 QueryBuilder 在数据库层过滤，避免全量加载到内存
+    suspend fun filter(name: String?) = safeDbOp {
+        if (!name.isNullOrBlank()) {
+            getBox<Food>()?.query(Food_.name.contains(name))?.build()?.find()
+                ?.distinctBy { it.name }
+        } else {
+            getBox<Food>()?.all?.distinctBy { it.name }
+        } ?: emptyList()
+    }
+
+    // 使用 QueryBuilder 在数据库层删除，避免全量加载到内存
+    suspend fun remove(name: String) = safeDbOp {
+        getBox<Food>()?.query(Food_.name.equal(name))?.build()?.remove()
+    }
+
+    /**
+     * 按名称分组统计采集数量
+     * 使用属性查询只加载 name 字段，不加载 foodVector，节省大量内存
+     * @param nameFilter 名称过滤关键词，为空时查询全部
+     * @return 按名称分组后的 (名称, 数量) 列表，按名称排序
+     */
+    suspend fun queryFoodNameCounts(nameFilter: String? = null) = safeDbOp {
+        val box = getBox<Food>() ?: return@safeDbOp emptyList<Pair<String, Int>>()
+        val query = if (!nameFilter.isNullOrBlank()) {
+            box.query(Food_.name.contains(nameFilter)).build()
+        } else {
+            box.query().build()
+        }
+        try {
+            // 只查 name 字段，完全不加载 foodVector
+            query.property(Food_.name).findStrings()
+                .groupingBy { it }
+                .eachCount()
+                .map { (name, count) -> Pair(name, count) }
+                .sortedBy { it.first }
+        } finally {
+            query.close()
+        }
+    } ?: emptyList()
+
+    private val dbMutex = Mutex() // 协程并发锁，保证写入操作原子性
+    private const val DB_DIR_NAME = "objectbox" // ObjectBox 默认数据库目录
+    private const val BACKUP_DIR_NAME = "objectbox_backup" // 备份目录
+
+    // 检查内部存储是否可读写（操作数据库前调用）
+    // 修复：原逻辑错误地检查外部存储状态，数据库存于内部存储，与外部存储无关
+    fun isStorageAvailable(context: Context): Boolean {
+        return try {
+            context.filesDir.canRead() && context.filesDir.canWrite()
+        } catch (e: Exception) {
+            false
+        }
+    }
+
+    // 备份数据库到应用私有目录（无权限要求，推荐）
+    suspend fun backupDb(context: Context): Boolean = withContext(Dispatchers.IO) {
+        if (!isStorageAvailable(context)) return@withContext false
+        val dbDir = File(context.filesDir, DB_DIR_NAME)
+        val backupDir = File(context.filesDir, BACKUP_DIR_NAME)
+        return@withContext copyDir(dbDir, backupDir)
+    }
+
+    // 从备份恢复数据库（恢复后会重建BoxStore）
+    suspend fun restoreDb(context: Context): Boolean = withContext(Dispatchers.IO) {
+        if (!isStorageAvailable(context)) return@withContext false
+        val dbDir = File(context.filesDir, DB_DIR_NAME)
+        val backupDir = File(context.filesDir, BACKUP_DIR_NAME)
+        if (!backupDir.exists()) return@withContext false
+        // 先关闭旧的BoxStore，删除损坏文件，再恢复备份
+        boxStore?.close()
+        deleteDbFiles(context)
+        val isSuccess = copyDir(backupDir, dbDir)
+        // 重新初始化
+        init(context)
+        return@withContext isSuccess
+    }
+
+    // 递归删除数据库文件
+    private fun deleteDbFiles(context: Context) {
+        val dbDir = File(context.filesDir, DB_DIR_NAME)
+        if (dbDir.exists()) deleteDirRecursively(dbDir)
+    }
+
+    // 递归删除目录
+    private fun deleteDirRecursively(file: File) {
+        if (file.isDirectory) {
+            file.listFiles()?.forEach { deleteDirRecursively(it) }
+        }
+        file.delete()
+    }
+
+    // 递归复制目录（核心备份/恢复逻辑）
+    private fun copyDir(srcDir: File, destDir: File): Boolean {
+        return try {
+            if (!srcDir.exists()) return false
+            if (!destDir.exists()) destDir.mkdirs()
+            srcDir.listFiles()?.forEach { srcFile ->
+                val destFile = File(destDir, srcFile.name)
+                if (srcFile.isDirectory) {
+                    copyDir(srcFile, destFile)
+                } else {
+                    copyFile(srcFile, destFile)
+                }
+            }
+            true
+        } catch (e: IOException) {
+            e.printStackTrace()
+            false
+        }
+    }
+
+    // 复制单个文件（使用NIO，高效稳定）
+    private fun copyFile(srcFile: File, destFile: File) {
+        FileInputStream(srcFile).channel.use { srcChannel ->
+            FileOutputStream(destFile).channel.use { destChannel ->
+                destChannel.transferFrom(srcChannel, 0, srcChannel.size())
+            }
+        }
+    }
+
+    // 关闭BoxStore（应用退出时调用，可选）
+    fun close() {
+        boxStore?.close()
+        boxStore = null
+    }
+
+}
@@ -0,0 +1,156 @@
+package com.shuwei.dish.match.scale
+
+import android.content.Context
+import android.net.nsd.NsdManager
+import android.net.nsd.NsdServiceInfo
+import android.util.Log
+import java.util.LinkedList
+
+/**
+ * mDNS 设备发现管理器（仅主设备运行）
+ * 持续扫描局域网，发现或丢失 DishMatch 子设备时通过回调通知连接管理器
+ *
+ * 注意：Android NsdManager.resolveService 不支持并发调用，多台子设备同时被发现时
+ * 会报 FAILURE_ALREADY_ACTIVE(3) 导致解析失败。此处使用串行队列逐一解析。
+ */
+class MdnsDiscoveryManager(private val context: Context) {
+
+    companion object {
+        private const val TAG = "MdnsDiscoveryManager"
+    }
+
+    private val nsdManager: NsdManager by lazy {
+        context.getSystemService(Context.NSD_SERVICE) as NsdManager
+    }
+
+    private var discoveryListener: NsdManager.DiscoveryListener? = null
+    private var isDiscovering = false
+
+    /** 待解析队列，串行处理避免并发解析失败 */
+    private val resolveQueue = LinkedList<NsdServiceInfo>()
+    @Volatile
+    private var isResolving = false
+
+    /**
+     * 发现新设备时的回调：(deviceId, host, port)
+     */
+    var onDeviceFound: ((deviceId: String, host: String, port: Int) -> Unit)? = null
+
+    /**
+     * 设备离线时的回调：(deviceId)
+     */
+    var onDeviceLost: ((deviceId: String) -> Unit)? = null
+
+    /**
+     * 开始扫描局域网中的 DishMatch 设备
+     */
+    fun startDiscovery() {
+        if (isDiscovering) return
+
+        discoveryListener = object : NsdManager.DiscoveryListener {
+            override fun onStartDiscoveryFailed(serviceType: String, errorCode: Int) {
+                Log.e(TAG, "开始扫描失败: errorCode=$errorCode")
+                isDiscovering = false
+            }
+
+            override fun onStopDiscoveryFailed(serviceType: String, errorCode: Int) {
+                Log.e(TAG, "停止扫描失败: errorCode=$errorCode")
+            }
+
+            override fun onDiscoveryStarted(serviceType: String) {
+                Log.d(TAG, "mDNS 扫描已启动")
+                isDiscovering = true
+            }
+
+            override fun onDiscoveryStopped(serviceType: String) {
+                Log.d(TAG, "mDNS 扫描已停止")
+                isDiscovering = false
+            }
+
+            override fun onServiceFound(service: NsdServiceInfo) {
+                // 只处理 DishMatch 服务
+                if (!service.serviceName.startsWith("DishMatch-")) return
+                Log.d(TAG, "发现设备: ${service.serviceName}")
+                enqueueResolve(service)
+            }
+
+            override fun onServiceLost(service: NsdServiceInfo) {
+                if (!service.serviceName.startsWith("DishMatch-")) return
+                val deviceId = service.serviceName.removePrefix("DishMatch-")
+                Log.d(TAG, "设备离线: $deviceId")
+                onDeviceLost?.invoke(deviceId)
+            }
+        }
+
+        nsdManager.discoverServices(
+            MdnsRegisterManager.SERVICE_TYPE,
+            NsdManager.PROTOCOL_DNS_SD,
+            discoveryListener
+        )
+    }
+
+    /**
+     * 解析服务获取 IP 和端口
+     */
+    private fun resolveService(service: NsdServiceInfo) {
+        nsdManager.resolveService(service, object : NsdManager.ResolveListener {
+            override fun onResolveFailed(info: NsdServiceInfo, errorCode: Int) {
+                Log.e(TAG, "解析设备地址失败: ${info.serviceName}, errorCode=$errorCode")
+                // 解析结束（失败），继续处理队列中下一个
+                processNextResolve()
+            }
+
+            override fun onServiceResolved(info: NsdServiceInfo) {
+                val deviceId = info.serviceName.removePrefix("DishMatch-")
+                val host = info.host?.hostAddress ?: run {
+                    processNextResolve()
+                    return
+                }
+                val port = info.port
+                Log.d(TAG, "设备地址已解析: $deviceId -> $host:$port")
+                onDeviceFound?.invoke(deviceId, host, port)
+                // 解析结束（成功），继续处理队列中下一个
+                processNextResolve()
+            }
+        })
+    }
+
+    /** 将待解析服务加入队列，若当前无解析任务则立即开始 */
+    @Synchronized
+    private fun enqueueResolve(service: NsdServiceInfo) {
+        resolveQueue.add(service)
+        if (!isResolving) {
+            processNextResolve()
+        }
+    }
+
+    /** 从队列取出下一个服务进行解析 */
+    @Synchronized
+    private fun processNextResolve() {
+        val next = resolveQueue.poll() ?: run {
+            isResolving = false
+            return
+        }
+        isResolving = true
+        resolveService(next)
+    }
+
+    /**
+     * 停止扫描，在应用退出时调用
+     */
+    fun stopDiscovery() {
+        if (!isDiscovering) return
+        discoveryListener?.let {
+            try {
+                nsdManager.stopServiceDiscovery(it)
+            } catch (e: Exception) {
+                Log.e(TAG, "停止扫描异常: ${e.message}")
+            }
+        }
+        discoveryListener = null
+        synchronized(this) {
+            resolveQueue.clear()
+            isResolving = false
+        }
+    }
+}
@@ -0,0 +1,80 @@
+package com.shuwei.dish.match.scale
+
+import android.content.Context
+import android.net.nsd.NsdManager
+import android.net.nsd.NsdServiceInfo
+import android.util.Log
+
+/**
+ * mDNS 服务注册管理器（主设备和子设备均运行）
+ * 将本机 WebSocket 服务以 mDNS 形式广播到局域网，让主设备能发现本机 IP:PORT
+ */
+class MdnsRegisterManager(private val context: Context) {
+
+    companion object {
+        private const val TAG = "MdnsRegisterManager"
+        /** mDNS 服务类型，所有 DishMatch 设备使用统一类型 */
+        const val SERVICE_TYPE = "_dishmatch._tcp."
+        /** WebSocket 服务监听端口 */
+        const val WS_PORT = 8765
+    }
+
+    private val nsdManager: NsdManager by lazy {
+        context.getSystemService(Context.NSD_SERVICE) as NsdManager
+    }
+
+    private var registrationListener: NsdManager.RegistrationListener? = null
+    private var isRegistered = false
+
+    /**
+     * 向局域网注册 mDNS 服务
+     * @param deviceId 当前设备 ID，作为服务名称后缀，便于主设备识别
+     */
+    fun register(deviceId: String) {
+        if (isRegistered) return
+
+        val serviceInfo = NsdServiceInfo().apply {
+            serviceName = "DishMatch-$deviceId"
+            serviceType = SERVICE_TYPE
+            port = WS_PORT
+        }
+
+        registrationListener = object : NsdManager.RegistrationListener {
+            override fun onRegistrationFailed(info: NsdServiceInfo, errorCode: Int) {
+                Log.e(TAG, "mDNS 注册失败, errorCode=$errorCode")
+                isRegistered = false
+            }
+
+            override fun onUnregistrationFailed(info: NsdServiceInfo, errorCode: Int) {
+                Log.e(TAG, "mDNS 注销失败, errorCode=$errorCode")
+            }
+
+            override fun onServiceRegistered(info: NsdServiceInfo) {
+                Log.d(TAG, "mDNS 注册成功: ${info.serviceName}")
+                isRegistered = true
+            }
+
+            override fun onServiceUnregistered(info: NsdServiceInfo) {
+                Log.d(TAG, "mDNS 已注销: ${info.serviceName}")
+                isRegistered = false
+            }
+        }
+
+        nsdManager.registerService(serviceInfo, NsdManager.PROTOCOL_DNS_SD, registrationListener)
+    }
+
+    /**
+     * 注销 mDNS 服务，在应用退出时调用
+     */
+    fun unregister() {
+        if (!isRegistered) return
+        registrationListener?.let {
+            try {
+                nsdManager.unregisterService(it)
+            } catch (e: Exception) {
+                Log.e(TAG, "注销 mDNS 异常: ${e.message}")
+            }
+        }
+        registrationListener = null
+    }
+}
@@ -0,0 +1,17 @@
+package com.shuwei.dish.match.scale
+
+/**
+ * 主设备向子设备发送的控制指令
+ * @param cmd      指令类型，如 "tare"（清零）
+ * @param deviceId 目标设备 ID，子设备收到后校验是否匹配自身
+ * @param address  目标秤地址
+ */
+data class ScaleCommand(
+    val cmd: String,
+    val deviceId: String,
+    val address: Int
+) {
+    companion object {
+        const val CMD_TARE = "tare"
+    }
+}
@@ -0,0 +1,20 @@
+package com.shuwei.dish.match.scale
+
+/**
+ * 单个秤的数据快照
+ * @param deviceId 所属设备 ID
+ * @param address  秤地址编号（硬件 address，对应 WeightUtil 回调的 address 参数）
+ * @param weight   重量，单位克
+ * @param state    秤状态：1=稳定，0=不稳定，2=量程溢出（对应 WeightUtil 中的 STATE_* 常量）
+ * @param ts       数据时间戳（毫秒）
+ * @param ip       所属设备的 IP 地址，用于 UI 展示；网络传输数据中可能为空
+ */
+data class ScaleData(
+    val deviceId: String,
+    val address: Int,
+    val weight: Double,
+    val state: Int,
+    val ts: Long,
+    val ip: String = "",
+    val name: String? = null
+)
@@ -0,0 +1,122 @@
+package com.shuwei.dish.match.scale
+
+import android.util.Log
+import com.shuwei.dish.match.utils.WeightUtil
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import java.util.concurrent.ConcurrentHashMap
+
+/**
+ * 秤数据聚合器（仅主设备运行）
+ * 统一管理本机秤（直接读取 WeightUtil）和远端子设备秤（通过 WebSocket 接收）的数据
+ * 通过 StateFlow 将所有秤的最新快照暴露给 UI 层
+ *
+ * 数据 Map 的 key 格式："{deviceId}#{address}"，便于 UI 按设备分组展示
+ */
+class ScaleDataAggregator(private val localDeviceId: String) {
+
+    companion object {
+        private const val TAG = "ScaleDataAggregator"
+        /** 本机秤监听器的 key，防止与其他监听器冲突 */
+        private const val LOCAL_LISTENER_KEY = "ScaleDataAggregator_local"
+    }
+
+    /** 所有秤的最新数据，UI 层通过此 Flow 订阅更新 */
+    private val _allScales = MutableStateFlow<Map<String, ScaleData>>(emptyMap())
+    val allScales: StateFlow<Map<String, ScaleData>> = _allScales.asStateFlow()
+
+    /** 内部缓存，并发安全 */
+    private val cache = ConcurrentHashMap<String, ScaleData>()
+
+    /** deviceId → IP 地址映射，用于写入 ScaleData.ip 字段 */
+    private val deviceIpMap = ConcurrentHashMap<String, String>()
+
+    /**
+     * 设置指定设备的 IP 地址
+     * 若缓存中已有该设备的数据且 ip 为空，立即回填并触发 StateFlow 更新，
+     * 解决早期数据包在 IP 到达前入缓存导致一直显示"未知"的问题
+     * @param deviceId 设备 ID
+     * @param ip       IP 地址字符串
+     */
+    fun setDeviceIp(deviceId: String, ip: String) {
+        if (ip.isEmpty()) return
+        deviceIpMap[deviceId] = ip
+        // 回填该设备所有 ip 为空的缓存条目
+        val keys = cache.keys.filter { it.startsWith("$deviceId#") }
+        if (keys.isEmpty()) return
+        var updated = false
+        keys.forEach { key ->
+            val old = cache[key] ?: return@forEach
+            if (old.ip.isEmpty()) {
+                cache[key] = old.copy(ip = ip)
+                updated = true
+            }
+        }
+        if (updated) {
+            _allScales.value = HashMap(cache)
+            Log.d(TAG, "已回填设备IP: $deviceId -> $ip, 共 ${keys.size} 条")
+        }
+    }
+
+    /**
+     * 启动本机秤数据监听
+     * 主设备本机秤直接读取 WeightUtil，无需经过网络
+     */
+    fun startLocalCollection() {
+        WeightUtil.addWeightListener(LOCAL_LISTENER_KEY) { address, state, weight ->
+            val data = ScaleData(
+                deviceId = localDeviceId,
+                address = address,
+                weight = weight,
+                state = state,
+                ts = System.currentTimeMillis(),
+                ip = deviceIpMap[localDeviceId] ?: ""
+            )
+            updateCache(data)
+        }
+        Log.d(TAG, "本机秤监听已启动, deviceId=$localDeviceId")
+    }
+
+    /**
+     * 处理来自 WebSocket 客户端的远端秤数据
+     * 由 ScaleWebSocketClient.onScaleData 回调触发
+     * 自动补充该设备已记录的 IP 信息
+     */
+    fun onRemoteScaleData(data: ScaleData) {
+        val ip = deviceIpMap[data.deviceId] ?: data.ip
+        updateCache(if (ip.isNotEmpty() && data.ip.isEmpty()) data.copy(ip = ip) else data)
+    }
+
+    /**
+     * 移除指定设备的所有秤数据（设备离线时调用）
+     */
+    fun removeDevice(deviceId: String) {
+        val keysToRemove = cache.keys.filter { it.startsWith("$deviceId#") }
+        if (keysToRemove.isEmpty()) return
+        keysToRemove.forEach { cache.remove(it) }
+        deviceIpMap.remove(deviceId)
+        _allScales.value = HashMap(cache)
+        Log.d(TAG, "已移除设备数据: $deviceId, 共 ${keysToRemove.size} 个秤")
+    }
+
+    /**
+     * 停止本机秤监听并清空所有数据
+     */
+    fun stop() {
+        WeightUtil.removeWeightListener(LOCAL_LISTENER_KEY)
+        cache.clear()
+        deviceIpMap.clear()
+        _allScales.value = emptyMap()
+        Log.d(TAG, "ScaleDataAggregator 已停止")
+    }
+
+    /**
+     * 更新缓存并发布新快照到 StateFlow
+     */
+    private fun updateCache(data: ScaleData) {
+        val key = "${data.deviceId}#${data.address}"
+        cache[key] = data
+        _allScales.value = HashMap(cache)
+    }
+}
@@ -0,0 +1,22 @@
+package com.shuwei.dish.match.scale
+
+/**
+ * 各子设备的固定 ID 与秤地址排列顺序配置
+ * MasterScaleActivity 和 SlaveActivity 共用此配置，避免重复定义
+ */
+object ScaleDeviceConfig {
+
+    const val DEVICE_ID_2  = "8fc2ab34-2137-3112-acca-f884ea8736d4"
+    const val DEVICE_ID_22 = "a46fa55c-113c-3511-bb1f-41e5eff77c4b"
+    const val DEVICE_ID_18 = "1038da9f-c6eb-326e-a1d9-d6d3af978b22"
+    const val DEVICE_ID_1  = "7cc0f6ea-f13d-3013-a867-fc998eb554ac"
+
+    /** 22个秤的显示顺序（按物理位置排列） */
+    val SCALE_ORDER_22 = listOf(20, 22, 19, 21, 6, 12, 18, 5, 11, 17, 4, 10, 16, 3, 9, 15, 2, 8, 14, 1, 7, 13)
+
+    /** 18个秤的显示顺序（按物理位置排列） */
+    val SCALE_ORDER_18 = listOf(6, 5, 4, 3, 2, 1, 12, 11, 10, 9, 8, 7, 18, 17, 16, 15, 14, 13)
+
+    /** 设备在列表中的显示顺序 */
+    val DEVICE_ORDER = listOf(DEVICE_ID_2, DEVICE_ID_22, DEVICE_ID_18, DEVICE_ID_1)
+}
@@ -0,0 +1,38 @@
+package com.shuwei.dish.match.scale
+
+/**
+ * 秤事件数据类，用于主设备和子设备之间的非重量类通知
+ * @param type     事件类型，参见 companion object 中的常量
+ * @param deviceId 发送方设备 ID
+ * @param address  触发事件的秤地址，TYPE_SEASONING_CONFIG 时为 0（无意义）
+ * @param delta    重量变化量（克），仅 TYPE_SEASONING_ADDED 时有意义
+ * @param slots    调料槽位配置列表，仅 TYPE_SEASONING_CONFIG 时有效
+ */
+data class ScaleEvent(
+    val type: String,
+    val deviceId: String,
+    val address: Int = 0,
+    val delta: Double = 0.0,
+    val slots: List<SlotConfig>? = null
+) {
+    /**
+     * 单个槽位的配置信息，随 TYPE_SEASONING_CONFIG 事件一起传输
+     * @param deviceId  所属设备 ID
+     * @param address   秤硬件地址
+     * @param goodsId   调料 ID
+     * @param goodsName 调料名称
+     */
+    data class SlotConfig(
+        val deviceId: String,
+        val address: Int,
+        val goodsId: String,
+        val goodsName: String
+    )
+
+    companion object {
+        /** 调料添加事件：某秤重量增加超过阈值 */
+        const val TYPE_SEASONING_ADDED = "seasoning_added"
+        /** 调料槽位配置同步事件：主设备配置变更后广播给子设备 */
+        const val TYPE_SEASONING_CONFIG = "seasoning_config"
+    }
+}
@@ -0,0 +1,245 @@
+package com.shuwei.dish.match.scale
+
+import android.content.Context
+import android.util.Log
+import com.shuwei.dish.match.base.BaseApp
+import com.shuwei.dish.match.base.DeviceRole
+import com.shuwei.dish.match.base.GlobalData
+import com.shuwei.dish.match.utils.NetworkUtil
+import com.shuwei.dish.match.utils.WeightUtil
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+
+/**
+ * 秤服务统一门面（单例）
+ * 根据当前设备角色（MASTER/SLAVE）启动对应的服务组合：
+ *
+ * 所有设备均运行：
+ *   - MdnsRegisterManager：将本机 WebSocket 服务广播到局域网
+ *   - ScaleWebSocketServer：对外提供本机秤数据推送服务
+ *
+ * 仅主设备（MASTER）额外运行：
+ *   - MdnsDiscoveryManager：发现局域网内子设备
+ *   - ScaleWebSocketClient：连接子设备 WebSocket
+ *   - ScaleDataAggregator：聚合本机 + 远端所有秤数据
+ *
+ * 使用方式：
+ *   在 Application.onCreate() 中调用 ScaleServiceManager.start(context)
+ *   在 Application.onTerminate() 中调用 ScaleServiceManager.stop()
+ *   主设备 UI 通过 ScaleServiceManager.allScales 订阅全量秤数据
+ */
+object ScaleServiceManager {
+
+    private const val TAG = "ScaleServiceManager"
+
+    private var mdnsRegister: MdnsRegisterManager? = null
+    private var wsServer: ScaleWebSocketServer? = null
+    private var udpSender: UdpBroadcastSender? = null
+
+    // 以下仅主设备使用
+    private var mdnsDiscovery: MdnsDiscoveryManager? = null
+    private var udpReceiver: UdpBroadcastReceiver? = null
+    private var wsClient: ScaleWebSocketClient? = null
+    private var aggregator: ScaleDataAggregator? = null
+
+    /**
+     * 所有秤数据的实时流，仅主设备有效；子设备返回 null
+     * UI 层通过 lifecycleScope.launch { allScales?.collect { ... } } 订阅
+     */
+    val allScales: StateFlow<Map<String, ScaleData>>?
+        get() = aggregator?.allScales
+
+    /**
+     * 收到子设备秤事件（如调料添加）时的回调，仅主设备有效
+     * 在子线程中调用，需自行切换到主线程更新 UI
+     */
+    private var _onScaleEvent: ((ScaleEvent) -> Unit)? = null
+    var onScaleEvent: ((ScaleEvent) -> Unit)?
+        get() = _onScaleEvent
+        set(value) {
+            _onScaleEvent = value
+            wsClient?.onScaleEvent = value
+        }
+
+    /**
+     * 收到主设备下发的调料配置同步事件时的回调，仅子设备有效
+     * 在子线程中调用，需自行切换到主线程更新 UI
+     */
+    var onSeasoningConfig: ((ScaleEvent) -> Unit)?
+        get() = wsServer?.onSeasoningConfig
+        set(value) { wsServer?.onSeasoningConfig = value }
+
+    /**
+     * 向所有已连接子设备广播调料配置（主设备调用）
+     * @param slots 全量槽位配置列表
+     */
+    fun sendSeasoningConfig(slots: List<ScaleEvent.SlotConfig>) {
+        wsClient?.sendToAllSlaves(buildConfigEvent(slots))
+    }
+
+    /**
+     * 向单台刚连接的子设备推送调料配置（连接时按需调用）
+     * @param deviceId 目标子设备 ID
+     */
+    private fun sendSeasoningConfigTo(deviceId: String, slots: List<ScaleEvent.SlotConfig>) {
+        wsClient?.sendToDevice(deviceId, buildConfigEvent(slots))
+    }
+
+    private fun buildConfigEvent(slots: List<ScaleEvent.SlotConfig>) = ScaleEvent(
+        type = ScaleEvent.TYPE_SEASONING_CONFIG,
+        deviceId = GlobalData.deviceId,
+        slots = slots
+    )
+
+    /**
+     * 向主设备广播秤事件（子设备调用）
+     * @param event 要广播的事件
+     */
+    fun broadcastEvent(event: ScaleEvent) {
+        wsServer?.broadcastEvent(event)
+    }
+
+    /**
+     * 主设备连接状态回调（仅子设备使用）
+     * 设置后会立即转发给 wsServer；需在 start() 之后设置才能生效
+     */
+    var onMasterConnectionChanged: ((connected: Boolean) -> Unit)?
+        get() = wsServer?.onConnectionChanged
+        set(value) { wsServer?.onConnectionChanged = value }
+
+    /** 当前是否有主设备连接（仅子设备使用） */
+    val isMasterConnected: Boolean
+        get() = wsServer?.isConnected == true
+
+    /**
+     * 启动所有秤服务，在 Application.onCreate() 中调用
+     */
+    fun start(context: Context) {
+        val deviceId = GlobalData.deviceId
+        val role = GlobalData.deviceRole
+        Log.d(TAG, "启动秤服务, deviceId=$deviceId, role=$role")
+
+        // 所有设备：启动 WebSocket 服务端 + mDNS 注册
+        wsServer = ScaleWebSocketServer(deviceId, context).also { it.start() }
+        mdnsRegister = MdnsRegisterManager(context).also { it.register(deviceId) }
+
+        if (role == DeviceRole.MASTER) {
+            startMasterServices(context, deviceId)
+        } else {
+            // 子设备：启动 UDP 广播，作为 mDNS 的兜底发现机制
+            val localIp = getLocalIp(context)
+            udpSender = UdpBroadcastSender(deviceId, localIp).also { it.start() }
+        }
+    }
+
+    /**
+     * 获取本机局域网 IP，委托给 NetworkUtil 统一处理版本兼容
+     */
+    private fun getLocalIp(context: Context): String {
+        return NetworkUtil.getLocalIpAddress(context)
+    }
+
+    /**
+     * 启动主设备专属服务
+     */
+    private fun startMasterServices(context: Context, deviceId: String) {
+        // 聚合器：统一管理本机 + 远端秤数据
+        aggregator = ScaleDataAggregator(deviceId).also {
+            // 记录本机 IP，供本机秤数据展示使用
+            it.setDeviceIp(deviceId, getLocalIp(context))
+            it.startLocalCollection()
+        }
+
+        // WebSocket 客户端
+        val client = ScaleWebSocketClient().also {
+            it.onScaleData = { data -> aggregator?.onRemoteScaleData(data) }
+            it.onScaleEvent = { event -> _onScaleEvent?.invoke(event) }
+            it.onDeviceDisconnected = { remoteId -> aggregator?.removeDevice(remoteId) }
+            it.onDeviceConnected = { remoteId ->
+                // 子设备连接成功时，从 Room 读取全量配置并单独推送给该设备
+                CoroutineScope(Dispatchers.IO).launch {
+                    val slots = BaseApp.instance!!.database.seasoningSlotDao()
+                        .queryAll()
+                        .map { slot ->
+                            ScaleEvent.SlotConfig(
+                                slot.deviceId, slot.address, slot.goodsId, slot.goodsName
+                            )
+                        }
+                    if (slots.isNotEmpty()) sendSeasoningConfigTo(remoteId, slots)
+                }
+            }
+        }
+        wsClient = client
+
+        // 统一的设备发现处理：mDNS 和 UDP 共用同一逻辑
+        fun onDeviceFound(remoteId: String, host: String, port: Int) {
+            if (remoteId == deviceId) return
+            Log.d(TAG, "发现子设备 $remoteId ($host:$port), 建立连接")
+            aggregator?.setDeviceIp(remoteId, host)
+            client.connect(remoteId, host, port)
+        }
+
+        // mDNS 发现：发现子设备 → 建立 WebSocket 连接；设备离线 → 仅清除 UDP 缓存，WebSocket 层自行重连
+        mdnsDiscovery = MdnsDiscoveryManager(context).also { discovery ->
+            discovery.onDeviceFound = { remoteId, host, port ->
+                onDeviceFound(remoteId, host, port)
+            }
+            discovery.onDeviceLost = { remoteId ->
+                // mDNS 抖动不永久断开，WebSocket 层会持续重连直到网络恢复
+                // 仅清除 UDP 缓存，确保 UDP 重新发现时能再次触发 onDeviceFound
+                udpReceiver?.removeDevice(remoteId)
+                Log.d(TAG, "子设备 mDNS 离线: $remoteId, 保持 WebSocket 重连")
+            }
+            discovery.startDiscovery()
+        }
+
+        // UDP 广播接收：作为 mDNS 的兜底，发现 mDNS 未能触发的子设备
+        udpReceiver = UdpBroadcastReceiver().also { receiver ->
+            receiver.onDeviceFound = { remoteId, host, port ->
+                onDeviceFound(remoteId, host, port)
+            }
+            receiver.start()
+        }
+    }
+
+    /**
+     * 向指定设备的指定秤发送清零指令
+     * - 本机秤：直接调用 WeightUtil.tareTwo
+     * - 子设备秤：通过 WebSocket 发送指令
+     * @param deviceId 目标设备 ID
+     * @param address  目标秤地址
+     */
+    fun sendTare(deviceId: String, address: Int): Boolean {
+        return if (deviceId == GlobalData.deviceId) {
+            WeightUtil.tareTwo(address)
+            true
+        } else {
+            val cmd = ScaleCommand(ScaleCommand.CMD_TARE, deviceId, address)
+            wsClient?.sendCommand(deviceId, cmd) ?: false
+        }
+    }
+
+    /**
+     * 停止所有秤服务，在 Application.onTerminate() 或退出时调用
+     */
+    fun stop() {
+        mdnsDiscovery?.stopDiscovery()
+        udpReceiver?.stop()
+        udpSender?.stop()
+        wsClient?.shutdown()
+        aggregator?.stop()
+        wsServer?.stop()
+        mdnsRegister?.unregister()
+
+        mdnsDiscovery = null
+        udpReceiver = null
+        udpSender = null
+        wsClient = null
+        aggregator = null
+        wsServer = null
+        mdnsRegister = null
+        Log.d(TAG, "所有秤服务已停止")
+    }
+}
@@ -0,0 +1,202 @@
+package com.shuwei.dish.match.scale
+
+import android.util.Log
+import com.google.gson.Gson
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import okhttp3.WebSocket
+import okhttp3.WebSocketListener
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.Executors
+import java.util.concurrent.ScheduledExecutorService
+import java.util.concurrent.ScheduledFuture
+import java.util.concurrent.TimeUnit
+
+/**
+ * 秤数据 WebSocket 客户端连接管理器（仅主设备运行）
+ * 管理与多台子设备的 WebSocket 长连接，支持断线自动重连（指数退避）
+ */
+class ScaleWebSocketClient {
+
+    companion object {
+        private const val TAG = "ScaleWebSocketClient"
+        /** 初始重连间隔（毫秒） */
+        private const val RECONNECT_BASE_MS = 2_000L
+        /** 最大重连间隔（毫秒） */
+        private const val RECONNECT_MAX_MS = 30_000L
+    }
+
+    private val gson = Gson()
+
+    private val httpClient = OkHttpClient.Builder()
+        .connectTimeout(10, TimeUnit.SECONDS)
+        .readTimeout(0, TimeUnit.SECONDS)   // WebSocket 长连接不设置读取超时
+        .pingInterval(20, TimeUnit.SECONDS) // 心跳保活
+        .build()
+
+    /** 各设备当前 WebSocket 连接，key = deviceId */
+    private val connections = ConcurrentHashMap<String, WebSocket>()
+    /** 各设备当前重连任务，key = deviceId */
+    private val reconnectTasks = ConcurrentHashMap<String, ScheduledFuture<*>>()
+    /** 各设备当前重连延迟，key = deviceId */
+    private val reconnectDelays = ConcurrentHashMap<String, Long>()
+    /** 已主动移除的设备集合，不对其触发重连 */
+    private val removedDevices = ConcurrentHashMap.newKeySet<String>()
+
+    private val scheduler: ScheduledExecutorService = Executors.newSingleThreadScheduledExecutor()
+
+    /** 收到秤数据时的回调，在子线程调用 */
+    var onScaleData: ((data: ScaleData) -> Unit)? = null
+
+    /** 收到秤事件（如调料添加通知）时的回调，在子线程调用 */
+    var onScaleEvent: ((event: ScaleEvent) -> Unit)? = null
+
+    /** 设备断线时的回调（连接失败或关闭），在子线程调用 */
+    var onDeviceDisconnected: ((deviceId: String) -> Unit)? = null
+
+    /** 子设备首次连接成功时的回调，在子线程调用；可用于主设备主动推送全量配置 */
+    var onDeviceConnected: ((deviceId: String) -> Unit)? = null
+
+    /**
+     * 连接到指定子设备
+     * @param deviceId 子设备 ID
+     * @param host     子设备 IP
+     * @param port     子设备 WebSocket 端口
+     */
+    fun connect(deviceId: String, host: String, port: Int) {
+        removedDevices.remove(deviceId)
+        // 取消旧 IP 的重连任务，防止 IP 变化时新旧任务并发竞争
+        reconnectTasks.remove(deviceId)?.cancel(false)
+        reconnectDelays[deviceId] = RECONNECT_BASE_MS
+        doConnect(deviceId, host, port)
+    }
+
+    private fun doConnect(deviceId: String, host: String, port: Int) {
+        val url = "ws://$host:$port"
+        val request = Request.Builder().url(url).build()
+
+        val ws = httpClient.newWebSocket(request, object : WebSocketListener() {
+            override fun onOpen(webSocket: WebSocket, response: Response) {
+                Log.d(TAG, "已连接子设备: $deviceId ($url)")
+                connections[deviceId] = webSocket
+                reconnectDelays[deviceId] = RECONNECT_BASE_MS
+                reconnectTasks.remove(deviceId)?.cancel(false)
+                onDeviceConnected?.invoke(deviceId)
+            }
+
+            override fun onMessage(webSocket: WebSocket, text: String) {
+                try {
+                    // 通过 type 字段区分 ScaleEvent 与 ScaleData
+                    val raw = gson.fromJson(text, Map::class.java)
+                    if (raw.containsKey("type")) {
+                        val event = gson.fromJson(text, ScaleEvent::class.java)
+                        onScaleEvent?.invoke(event)
+                    } else {
+                        val data = gson.fromJson(text, ScaleData::class.java)
+                        onScaleData?.invoke(data)
+                    }
+                } catch (e: Exception) {
+                    Log.w(TAG, "解析消息失败: ${e.message}")
+                }
+            }
+
+            override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
+                Log.w(TAG, "连接子设备失败: $deviceId, ${t.message}")
+                connections.remove(deviceId)
+                onDeviceDisconnected?.invoke(deviceId)
+                scheduleReconnect(deviceId, host, port)
+            }
+
+            override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
+                Log.d(TAG, "子设备连接已关闭: $deviceId, reason=$reason")
+                connections.remove(deviceId)
+                onDeviceDisconnected?.invoke(deviceId)
+                scheduleReconnect(deviceId, host, port)
+            }
+        })
+
+        connections[deviceId] = ws
+    }
+
+    /**
+     * 指数退避重连
+     * 入口不拦截 removedDevices，仅在延迟任务执行前检查，
+     * 确保 disconnect() 后已入队的任务不执行，但新断线事件始终能进入重连流程
+     */
+    private fun scheduleReconnect(deviceId: String, host: String, port: Int) {
+        val delay = reconnectDelays[deviceId] ?: RECONNECT_BASE_MS
+        Log.d(TAG, "将在 ${delay}ms 后重连子设备: $deviceId")
+
+        val future = scheduler.schedule({
+            if (!removedDevices.contains(deviceId)) {
+                doConnect(deviceId, host, port)
+            }
+        }, delay, TimeUnit.MILLISECONDS)
+
+        reconnectTasks[deviceId]?.cancel(false)
+        reconnectTasks[deviceId] = future
+
+        // 下次重连延迟翻倍，上限 30s
+        reconnectDelays[deviceId] = minOf(delay * 2, RECONNECT_MAX_MS)
+    }
+
+    /**
+     * 向指定子设备发送控制指令
+     * @param deviceId 目标子设备 ID
+     * @param command  指令对象
+     * @return true=发送成功，false=设备未连接
+     */
+    fun sendCommand(deviceId: String, command: ScaleCommand): Boolean {
+        val ws = connections[deviceId] ?: return false
+        return ws.send(gson.toJson(command))
+    }
+
+    /**
+     * 向所有已连接的子设备广播事件（主设备调用，用于配置同步等场景）
+     * @param event 要广播的事件
+     */
+    fun sendToAllSlaves(event: ScaleEvent) {
+        val json = gson.toJson(event)
+        connections.values.forEach { ws ->
+            try { ws.send(json) } catch (e: Exception) {
+                Log.w(TAG, "sendToAllSlaves 失败: ${e.message}")
+            }
+        }
+    }
+
+    /**
+     * 向指定子设备发送事件（用于连接时单独推送配置）
+     * @param deviceId 目标子设备 ID
+     * @param event    要发送的事件
+     */
+    fun sendToDevice(deviceId: String, event: ScaleEvent) {
+        val ws = connections[deviceId] ?: return
+        try { ws.send(gson.toJson(event)) } catch (e: Exception) {
+            Log.w(TAG, "sendToDevice $deviceId 失败: ${e.message}")
+        }
+    }
+
+    /**
+     * 断开指定子设备连接（不再重连）
+     * @param deviceId 子设备 ID
+     */
+    fun disconnect(deviceId: String) {
+        removedDevices.add(deviceId)
+        reconnectTasks.remove(deviceId)?.cancel(false)
+        connections.remove(deviceId)?.close(1000, "设备离线")
+        reconnectDelays.remove(deviceId)
+        Log.d(TAG, "已断开子设备: $deviceId")
+    }
+
+    /**
+     * 关闭所有连接并释放资源，在应用退出时调用
+     */
+    fun shutdown() {
+        val ids = connections.keys.toList()
+        ids.forEach { disconnect(it) }
+        scheduler.shutdownNow()
+        httpClient.dispatcher.executorService.shutdown()
+        Log.d(TAG, "ScaleWebSocketClient 已关闭")
+    }
+}
@@ -0,0 +1,178 @@
+package com.shuwei.dish.match.scale
+
+import android.content.Context
+import android.util.Log
+import com.google.gson.Gson
+import com.shuwei.dish.match.utils.NetworkUtil
+import com.shuwei.dish.match.utils.WeightUtil
+import org.java_websocket.WebSocket
+import org.java_websocket.handshake.ClientHandshake
+import org.java_websocket.server.WebSocketServer
+import java.net.InetSocketAddress
+
+/**
+ * 秤数据 WebSocket 服务端（主设备和子设备均运行）
+ * 监听 WeightUtil 回调，将本机秤数据实时推送给所有已连接的主设备客户端
+ */
+class ScaleWebSocketServer(private val deviceId: String, private val context: Context) {
+
+    companion object {
+        private const val TAG = "ScaleWebSocketServer"
+        /** 节流间隔：两次推送之间的最小间隔（毫秒） */
+        private const val THROTTLE_MS = 100L
+    }
+
+    private val gson = Gson()
+    private var server: InternalServer? = null
+
+    /** 主设备连接状态变化回调：true=已连接，false=已断开；在主线程外调用，需自行切换线程 */
+    var onConnectionChanged: ((connected: Boolean) -> Unit)? = null
+
+    /** 收到主设备下发的调料配置同步事件时的回调，在子线程调用 */
+    var onSeasoningConfig: ((event: ScaleEvent) -> Unit)? = null
+
+    /** 当前是否有主设备连接 */
+    val isConnected: Boolean
+        get() = server?.connections?.isNotEmpty() == true
+
+    /** 每个秤地址的最近一次推送时间，用于节流 */
+    private val lastPushTime = mutableMapOf<Int, Long>()
+
+    /** 缓存各秤最新数据，新客户端连接时立即同步当前状态 */
+    private val latestData = mutableMapOf<Int, ScaleData>()
+
+    /**
+     * 启动 WebSocket 服务器，并注册 WeightUtil 回调
+     */
+    fun start() {
+        server = InternalServer(MdnsRegisterManager.WS_PORT)
+        server?.isReuseAddr = true
+        server?.start()
+        Log.d(TAG, "WebSocket 服务端已启动，端口 ${MdnsRegisterManager.WS_PORT}")
+
+        // 注册本机秤数据监听
+        WeightUtil.addWeightListener(TAG) { address, state, weight ->
+            val now = System.currentTimeMillis()
+            // 节流：同一地址 100ms 内只推送一次
+            if (now - (lastPushTime[address] ?: 0L) < THROTTLE_MS) return@addWeightListener
+
+            lastPushTime[address] = now
+            val data = ScaleData(
+                deviceId = deviceId,
+                address = address,
+                weight = weight,
+                state = state,
+                ts = now,
+                ip = NetworkUtil.getLocalIpAddress(context)
+            )
+            latestData[address] = data
+            broadcast(gson.toJson(data))
+        }
+    }
+
+    /**
+     * 停止 WebSocket 服务器，移除秤监听
+     */
+    fun stop() {
+        WeightUtil.removeWeightListener(TAG)
+        onConnectionChanged = null
+        onSeasoningConfig = null
+        try {
+            server?.stop(1000)
+        } catch (e: Exception) {
+            Log.e(TAG, "停止服务端异常: ${e.message}")
+        }
+        server = null
+        latestData.clear()
+        lastPushTime.clear()
+        Log.d(TAG, "WebSocket 服务端已停止")
+    }
+
+    /**
+     * 向所有已连接的主设备广播秤事件（如调料添加通知）
+     * @param event 要广播的事件
+     */
+    fun broadcastEvent(event: ScaleEvent) {
+        broadcast(gson.toJson(event))
+    }
+
+    /**
+     * 向所有已连接客户端广播消息
+     */
+    private fun broadcast(json: String) {
+        server?.connections?.forEach { conn ->
+            if (conn.isOpen) {
+                try {
+                    conn.send(json)
+                } catch (e: Exception) {
+                    Log.w(TAG, "推送失败: ${e.message}")
+                }
+            }
+        }
+    }
+
+    /**
+     * 内部 WebSocket 服务器实现
+     */
+    private inner class InternalServer(port: Int) :
+        WebSocketServer(InetSocketAddress(port)) {
+
+        override fun onOpen(conn: WebSocket, handshake: ClientHandshake) {
+            Log.d(TAG, "主设备已连接: ${conn.remoteSocketAddress}")
+            onConnectionChanged?.invoke(true)
+            // 新客户端连接后，立即推送所有秤的最新数据
+            latestData.values.forEach { data ->
+                try {
+                    conn.send(gson.toJson(data))
+                } catch (e: Exception) {
+                    Log.w(TAG, "初始推送失败: ${e.message}")
+                }
+            }
+        }
+
+        override fun onClose(conn: WebSocket, code: Int, reason: String, remote: Boolean) {
+            Log.d(TAG, "主设备已断开: ${conn.remoteSocketAddress}, reason=$reason")
+            // 若已无任何连接，通知子设备 UI 更新为未连接状态
+            if (server?.connections.isNullOrEmpty()) {
+                onConnectionChanged?.invoke(false)
+            }
+        }
+
+        override fun onMessage(conn: WebSocket, message: String) {
+            try {
+                val raw = gson.fromJson(message, Map::class.java)
+                if (raw.containsKey("type")) {
+                    // 主设备下发的事件（如调料配置同步）
+                    val event = gson.fromJson(message, ScaleEvent::class.java)
+                    when (event.type) {
+                        ScaleEvent.TYPE_SEASONING_CONFIG -> onSeasoningConfig?.invoke(event)
+                    }
+                    return
+                }
+                val cmd = gson.fromJson(message, ScaleCommand::class.java)
+                // 校验指令目标设备是否为本机
+                if (cmd.deviceId != deviceId) {
+                    Log.d(TAG, "收到清零指令, 但设备号不正确, deviceId=${cmd.deviceId}")
+                    return
+                }
+                when (cmd.cmd) {
+                    ScaleCommand.CMD_TARE -> {
+                        Log.d(TAG, "收到清零指令, address=${cmd.address}")
+                        WeightUtil.tareTwo(cmd.address)
+                    }
+                }
+            } catch (e: Exception) {
+                Log.w(TAG, "收到消息, 解析失败: ${e.message}")
+            }
+        }
+
+        override fun onError(conn: WebSocket?, ex: Exception) {
+            Log.e(TAG, "WebSocket 服务端错误: ${ex.message}")
+        }
+
+        override fun onStart() {
+            Log.d(TAG, "WebSocket 服务端 onStart")
+            connectionLostTimeout = 60
+        }
+    }
+}
@@ -0,0 +1,95 @@
+package com.shuwei.dish.match.scale
+
+import android.util.Log
+import com.google.gson.Gson
+import java.net.DatagramPacket
+import java.net.DatagramSocket
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.Executors
+
+/**
+ * UDP 广播接收器（主设备运行）
+ * 监听子设备发来的 UDP 广播包，解析后通过回调通知连接管理器
+ * 与 mDNS 互为备份，任意一条路发现子设备均可建立 WebSocket 连接
+ */
+class UdpBroadcastReceiver {
+
+    companion object {
+        private const val TAG = "UdpBroadcastReceiver"
+        private const val BUFFER_SIZE = 1024
+    }
+
+    private val gson = Gson()
+    private val executor = Executors.newSingleThreadExecutor()
+
+    /** 已发现的设备集合，避免重复触发回调，key=deviceId, value="host:port" */
+    private val knownDevices = ConcurrentHashMap<String, String>()
+
+    @Volatile
+    private var running = false
+    private var socket: DatagramSocket? = null
+
+    /**
+     * 发现新设备时的回调：(deviceId, host, port)
+     * 与 MdnsDiscoveryManager.onDeviceFound 签名一致，可共用同一处理逻辑
+     */
+    var onDeviceFound: ((deviceId: String, host: String, port: Int) -> Unit)? = null
+
+    /**
+     * 开始监听 UDP 广播
+     */
+    fun start() {
+        if (running) return
+        running = true
+        executor.execute { listenLoop() }
+        Log.d(TAG, "UDP 广播接收已启动, 监听端口=${UdpBroadcastSender.BROADCAST_PORT}")
+    }
+
+    private fun listenLoop() {
+        try {
+            socket = DatagramSocket(UdpBroadcastSender.BROADCAST_PORT).also { it.broadcast = true }
+            val buf = ByteArray(BUFFER_SIZE)
+            while (running) {
+                val packet = DatagramPacket(buf, buf.size)
+                socket?.receive(packet) ?: break
+                val json = String(packet.data, 0, packet.length, Charsets.UTF_8)
+                handlePacket(json)
+            }
+        } catch (e: Exception) {
+            if (running) Log.w(TAG, "UDP 接收异常: ${e.message}")
+        } finally {
+            socket?.close()
+            socket = null
+        }
+    }
+
+    private fun handlePacket(json: String) {
+        try {
+            val payload = gson.fromJson(json, UdpBroadcastSender.Payload::class.java)
+            val key = "${payload.ip}:${payload.port}"
+            // 同一设备已通知过则跳过，避免每5秒重复触发连接
+            if (knownDevices.put(payload.deviceId, key) == key) return
+            Log.d(TAG, "UDP 发现设备: ${payload.deviceId} -> ${payload.ip}:${payload.port}")
+            onDeviceFound?.invoke(payload.deviceId, payload.ip, payload.port)
+        } catch (e: Exception) {
+            Log.w(TAG, "解析 UDP 广播包失败: ${e.message}")
+        }
+    }
+
+    /**
+     * 移除已知设备记录，设备离线时调用，确保设备重新上线后能再次触发回调
+     */
+    fun removeDevice(deviceId: String) {
+        knownDevices.remove(deviceId)
+    }
+
+    /**
+     * 停止监听，释放资源
+     */
+    fun stop() {
+        running = false
+        socket?.close()
+        executor.shutdownNow()
+        Log.d(TAG, "UDP 广播接收已停止")
+    }
+}
@@ -0,0 +1,76 @@
+package com.shuwei.dish.match.scale
+
+import android.util.Log
+import com.google.gson.Gson
+import java.net.DatagramPacket
+import java.net.DatagramSocket
+import java.net.InetAddress
+import java.util.concurrent.Executors
+import java.util.concurrent.ScheduledFuture
+import java.util.concurrent.TimeUnit
+
+/**
+ * UDP 广播发送器（子设备运行）
+ * 每隔固定间隔向局域网广播本机的 deviceId、IP、WebSocket 端口
+ * 作为 mDNS 的兜底发现机制，确保主设备能可靠发现子设备
+ */
+class UdpBroadcastSender(
+    private val deviceId: String,
+    private val localIp: String,
+    private val wsPort: Int = MdnsRegisterManager.WS_PORT
+) {
+
+    companion object {
+        private const val TAG = "UdpBroadcastSender"
+        /** UDP 广播目标端口，与 UdpBroadcastReceiver 保持一致 */
+        const val BROADCAST_PORT = 8766
+        /** 广播间隔（秒） */
+        private const val INTERVAL_SEC = 5L
+    }
+
+    private val gson = Gson()
+    private val scheduler = Executors.newSingleThreadScheduledExecutor()
+    private var task: ScheduledFuture<*>? = null
+
+    /** 广播数据包结构 */
+    data class Payload(val deviceId: String, val ip: String, val port: Int)
+
+    /**
+     * 开始定时广播
+     */
+    fun start() {
+        if (task != null) return
+        task = scheduler.scheduleWithFixedDelay({
+            sendBroadcast()
+        }, 0, INTERVAL_SEC, TimeUnit.SECONDS)
+        Log.d(TAG, "UDP 广播已启动, deviceId=$deviceId, ip=$localIp, port=$wsPort")
+    }
+
+    private fun sendBroadcast() {
+        try {
+            val payload = gson.toJson(Payload(deviceId, localIp, wsPort))
+            val data = payload.toByteArray(Charsets.UTF_8)
+            DatagramSocket().use { socket ->
+                socket.broadcast = true
+                val packet = DatagramPacket(
+                    data, data.size,
+                    InetAddress.getByName("255.255.255.255"),
+                    BROADCAST_PORT
+                )
+                socket.send(packet)
+            }
+        } catch (e: Exception) {
+            Log.w(TAG, "UDP 广播发送失败: ${e.message}")
+        }
+    }
+
+    /**
+     * 停止广播，释放资源
+     */
+    fun stop() {
+        task?.cancel(false)
+        task = null
+        scheduler.shutdownNow()
+        Log.d(TAG, "UDP 广播已停止")
+    }
+}
@@ -0,0 +1,192 @@
+package com.shuwei.dish.match.ui
+
+import android.annotation.SuppressLint
+import android.graphics.Color
+import android.graphics.Typeface
+import android.os.Bundle
+import android.text.style.ForegroundColorSpan
+import android.text.style.StyleSpan
+import android.view.LayoutInflater
+import android.view.inputmethod.EditorInfo
+import androidx.core.widget.addTextChangedListener
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.shuwei.dish.match.R
+import com.shuwei.dish.match.adapter.CollectedFoodAdapter
+import com.shuwei.dish.match.base.BaseActivity
+import com.shuwei.dish.match.databinding.ActivityCollectedFoodBinding
+import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding
+import com.shuwei.dish.match.dialog.CommonDialog
+import com.shuwei.dish.match.entity.CollectedFoodItem
+import com.shuwei.dish.match.utils.KeyboardUtil
+import com.shuwei.dish.match.utils.ext.appendText
+import com.shuwei.dish.match.utils.ext.buildSpannableString
+import com.shuwei.dish.match.utils.ext.gone
+import com.shuwei.dish.match.utils.ext.toast
+import com.shuwei.dish.match.utils.ext.visible
+import kotlinx.coroutines.launch
+
+/**
+ * 已采集食材列表页面
+ * 展示所有已采集的食材及其采集数量，支持搜索和删除
+ */
+class CollectedFoodActivity : BaseActivity() {
+
+    private lateinit var binding: ActivityCollectedFoodBinding
+
+    private val foodList = mutableListOf<CollectedFoodItem>()
+
+    private var emptyViewBinding: LayoutEmptyViewBinding? = null
+
+    private val adapter by lazy {
+        CollectedFoodAdapter(foodList).apply {
+            isStateViewEnable = true
+            // 点击删除按钮，移除对应食材
+            addOnItemChildClickListener(R.id.ivDelete) { _, _, position ->
+                showDeleteDialog(foodList[position].foodName)
+            }
+            setOnItemClickListener { _, view, _ ->
+                KeyboardUtil.hideKeyboard(view)
+            }
+        }
+    }
+
+    /**
+     * 删除弹窗
+     */
+    private fun showDeleteDialog(foodName: String) {
+        val showFoodName = foodName.split("WP").first()
+        val separator = if (showFoodName.length <= 10) "\n" else ""
+        val content = buildSpannableString {
+            appendText("食材：")
+            appendText(showFoodName, StyleSpan(Typeface.BOLD), ForegroundColorSpan(Color.BLACK))
+            appendText(" 删除后无法恢复，${separator}确认要删除吗？")
+        }
+        CommonDialog(this)
+            .setTitle("温馨提示")
+            .setContent(content)
+            .setNegativeButton("取消")
+            .setPositiveButton("确认") {
+                appViewModel.removeCollectedFood(
+                    foodName = foodName,
+                    nameFilter = binding.editSearch.text.toString()
+                )
+            }
+            .show()
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        statusBarDarkFont(enable = true)
+        binding = ActivityCollectedFoodBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        setHeaderBackground()
+        binding.root.setOnClickListener { v ->
+            KeyboardUtil.hideKeyboard(v)
+        }
+        setTitleBar(titleBarAction = {
+            it.visible()
+            it.setOnClickListener { v ->
+                KeyboardUtil.hideKeyboard(v)
+            }
+        }, titleAction = {
+            it.text = "已采集食材"
+        }, rightIconActon = {
+            it.gone()
+        }, backAction = {
+            it.visible()
+            it.setOnClickListener {
+                finish()
+            }
+        })
+        initRecyclerView()
+        initSearch()
+        initObserver()
+        loadCollectedFoodList()
+    }
+
+    private fun loadCollectedFoodList(name: String = "") {
+        appViewModel.loadCollectedFoodList(nameFilter = name)
+    }
+
+    /**
+     * 收集 searchFoodState，统一处理 Loading / Success / Error 状态
+     */
+    @SuppressLint("NotifyDataSetChanged")
+    private fun initObserver() {
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                appViewModel.collectedFoodListState.collect { items ->
+                    foodList.clear()
+                    foodList.addAll(items)
+                    adapter.notifyDataSetChanged()
+                    if (items.isEmpty()) {
+                        loadEmptyView()
+                    }
+                }
+            }
+        }
+    }
+
+    /** 展示空视图 */
+    private fun loadEmptyView() {
+        if (emptyViewBinding == null) {
+            emptyViewBinding = LayoutEmptyViewBinding.inflate(
+                LayoutInflater.from(this), binding.rvCollectedFood, false
+            )
+        }
+        emptyViewBinding!!.tvContent.text = "暂无数据"
+        emptyViewBinding!!.tvSubContent.text = "未查询到食材信息"
+        adapter.stateView = emptyViewBinding!!.root
+    }
+
+    /** 初始化列表 */
+    private fun initRecyclerView() {
+        binding.rvCollectedFood.run {
+            layoutManager = LinearLayoutManager(this@CollectedFoodActivity)
+            adapter = this@CollectedFoodActivity.adapter
+        }
+    }
+
+    /** 初始化搜索栏交互 */
+    private fun initSearch() {
+        binding.btnSearch.setOnClickListener { v ->
+            performSearch {
+                toast(binding.editSearch.hint.toString())
+            }
+            KeyboardUtil.hideKeyboard(v)
+        }
+        binding.editSearch.run {
+            addTextChangedListener {
+                performSearch {
+                    loadCollectedFoodList()
+                }
+            }
+            setOnEditorActionListener { v, actionId, _ ->
+                if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+                    performSearch {
+                        toast(binding.editSearch.hint.toString())
+                    }
+                    KeyboardUtil.hideKeyboard(v)
+                    true
+                } else {
+                    false
+                }
+            }
+        }
+    }
+
+    /** 根据关键词过滤食材列表 */
+    @SuppressLint("NotifyDataSetChanged")
+    private fun performSearch(action: () -> Unit) {
+        val keyword = binding.editSearch.text.toString().trim()
+        if (keyword.isEmpty()) {
+            action()
+            return
+        }
+        // 根据关键词从数据库查询并刷新列表
+        loadCollectedFoodList(keyword)
+    }
+}
@@ -1,353 +1,345 @@
-package com.shuwei.dish.match.ui
-
-import android.graphics.Typeface
-import android.os.Bundle
-import android.text.SpannableStringBuilder
-import android.text.style.AbsoluteSizeSpan
-import android.text.style.ForegroundColorSpan
-import android.text.style.LineHeightSpan
-import android.text.style.StyleSpan
-import android.util.Log
-import android.util.SparseArray
-import android.util.SparseIntArray
-import android.widget.FrameLayout
-import android.widget.TextView
-import androidx.core.graphics.toColorInt
-import androidx.core.view.forEach
-import androidx.lifecycle.ViewModelProvider
-import com.shuwei.dish.match.base.BaseActivity
-import com.shuwei.dish.match.base.BaseApp
-import com.shuwei.dish.match.databinding.LayoutFoodRemindBinding
-import com.shuwei.dish.match.db.AppRepository
-import com.shuwei.dish.match.dialog.CommonDialog
-import com.shuwei.dish.match.entity.SeasoningEntity
-import com.shuwei.dish.match.entity.ResetReasoningRecord
-import com.shuwei.dish.match.utils.AddressUtil
-import com.shuwei.dish.match.utils.JsonAssetsLoader
-import com.shuwei.dish.match.utils.MultiClickDetector
-import com.shuwei.dish.match.utils.WeightUtil
-import com.shuwei.dish.match.utils.ext.appendText
-import com.shuwei.dish.match.utils.ext.buildSpannableString
-import com.shuwei.dish.match.utils.ext.dp
-import com.shuwei.dish.match.utils.ext.startActivity
-import com.shuwei.dish.match.utils.ext.toast
-import com.shuwei.dish.match.utils.ext.visible
-import com.shuwei.dish.match.viewmodel.AppViewModel
-import com.shuwei.dish.match.viewmodel.factory.AppFactory
-import com.shuwei.dish.match.R
-import com.shuwei.dish.match.adapter.TextCellAdapter
-import com.shuwei.dish.match.databinding.ActivityDeviceConfigBinding
-import com.shuwei.dish.match.dialog.BottomDialog2
-import com.shuwei.dish.match.utils.SpTool
-import com.shuwei.dish.match.utils.ext.clickWithDebounce
-import com.shuwei.dish.match.utils.ext.gone
-
-class DeviceConfigActivity : BaseActivity() {
-
-    companion object {
-
-        const val TAG = "DeviceSettingActivity"
-
-        const val COOK_MODE = "cookMode"
-
-        val modeList = listOf<ModeBean>(
-            ModeBean("制作模式", "菜品快速制作，记录熟重"),
-            ModeBean("采样模式", "菜品快速制作，记录熟重"),
-            ModeBean("品控模式", "菜品快速制作，记录熟重")
-        )
-    }
-
-    data class ModeBean(
-        var modeName: String,
-        var modeDesc: String
-    )
-
-    private lateinit var binding: ActivityDeviceConfigBinding
-
-    private lateinit var appViewModel: AppViewModel
-
-    private var cookMode: Int = 0
-//    private val weightArray = SparseIntArray()
-    private val weightArray = SparseArray<Double>()
-    private val addressArray = AddressUtil.getWeighAddressArray()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivityDeviceConfigBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        cookMode = intent.getIntExtra(COOK_MODE, 0)
-        initViewModel()
-        setHeaderBackground()
-        setTitleBar(titleBarAction = {
-            it.visible()
-        }, titleAction = {
-            it.text = "设备配置"
-        }, rightIconActon = {
-            it.gone()
-//            it.alpha = 0.0F
-//            it.setImageResource(R.drawable.ic_setting)
-//            it.setOnClickListener {_->
-//                detector.setOnDelayedMultiClickListener(it) {
-//                    defaultDataSettingDialog()
+//package com.shuwei.dish.match.ui
+//
+//import android.graphics.Typeface
+//import android.os.Bundle
+//import android.text.SpannableStringBuilder
+//import android.text.style.AbsoluteSizeSpan
+//import android.text.style.ForegroundColorSpan
+//import android.text.style.LineHeightSpan
+//import android.text.style.StyleSpan
+//import android.util.Log
+//import android.util.SparseArray
+//import android.widget.FrameLayout
+//import androidx.core.graphics.toColorInt
+//import androidx.core.view.forEach
+//import androidx.lifecycle.ViewModelProvider
+//import com.shuwei.dish.match.base.BaseActivity
+//import com.shuwei.dish.match.base.BaseApp
+//import com.shuwei.dish.match.db.DbRepository
+//import com.shuwei.dish.match.dialog.CommonDialog
+//import com.shuwei.dish.match.entity.SeasoningEntity
+//import com.shuwei.dish.match.entity.ResetReasoningRecord
+//import com.shuwei.dish.match.utils.AddressUtil
+//import com.shuwei.dish.match.utils.JsonAssetsLoader
+//import com.shuwei.dish.match.utils.MultiClickDetector
+//import com.shuwei.dish.match.utils.WeightUtil
+//import com.shuwei.dish.match.utils.ext.appendText
+//import com.shuwei.dish.match.utils.ext.buildSpannableString
+//import com.shuwei.dish.match.utils.ext.dp
+//import com.shuwei.dish.match.utils.ext.startActivity
+//import com.shuwei.dish.match.utils.ext.toast
+//import com.shuwei.dish.match.utils.ext.visible
+//import com.shuwei.dish.match.adapter.TextCellAdapter
+//import com.shuwei.dish.match.databinding.ActivityDeviceConfigBinding
+//import com.shuwei.dish.match.dialog.SeasoningSearchDialog
+//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.toJsonString
+//
+//class DeviceConfigActivity : BaseActivity() {
+//
+//    companion object {
+//
+//        const val TAG = "DeviceConfigActivity"
+//
+//        const val COOK_MODE = "cookMode"
+//
+//        val modeList = listOf<ModeBean>(
+//            ModeBean("制作模式", "菜品快速制作，记录熟重"),
+//            ModeBean("采样模式", "菜品快速制作，记录熟重"),
+//            ModeBean("品控模式", "菜品快速制作，记录熟重")
+//        )
+//    }
+//
+//    data class ModeBean(
+//        var modeName: String,
+//        var modeDesc: String
+//    )
+//
+//    private lateinit var binding: ActivityDeviceConfigBinding
+//
+//    private lateinit var appViewModel: DbViewModel
+//
+//    private var cookMode: Int = 0
+////    private val weightArray = SparseIntArray()
+//    private val weightArray = SparseArray<Double>()
+//    private val addressArray = AddressUtil.getWeighAddressArray()
+//
+//    override fun onCreate(savedInstanceState: Bundle?) {
+//        super.onCreate(savedInstanceState)
+//        binding = ActivityDeviceConfigBinding.inflate(layoutInflater)
+//        setContentView(binding.root)
+//        cookMode = intent.getIntExtra(COOK_MODE, 0)
+//        initViewModel()
+//        setHeaderBackground()
+//        setTitleBar(titleBarAction = {
+//            it.visible()
+//        }, titleAction = {
+//            it.text = "设备配置"
+//        }, rightIconActon = {
+//            it.gone()
+////            it.alpha = 0.0F
+////            it.setImageResource(R.drawable.ic_setting)
+////            it.setOnClickListener {_->
+////                detector.setOnDelayedMultiClickListener(it) {
+////                    defaultDataSettingDialog()
+////                }
+////            }
+//        })
+//
+//        loadQualitySpan(isEnable = false)
+//        when (cookMode) {
+//            1 -> {
+//                binding.rbModeCook.isChecked = true
+//                binding.rbModeSampling.isChecked = false
+//                loadCookSpan(isClicked = true)
+//                loadSamplingSpan()
+//            }
+//
+//            2 -> {
+//                binding.rbModeCook.isChecked = false
+//                binding.rbModeSampling.isChecked = true
+//                loadCookSpan()
+//                loadSamplingSpan(isClicked = true)
+//            }
+//
+//            else -> {
+//                binding.rbModeCook.isChecked = true
+//                binding.rbModeSampling.isChecked = false
+//                loadCookSpan(isClicked = true)
+//                loadSamplingSpan()
 //            }
 //        }
-        })
-
-        loadQualitySpan(isEnable = false)
-        when (cookMode) {
-            1 -> {
-                binding.rbModeCook.isChecked = true
-                binding.rbModeSampling.isChecked = false
-                loadCookSpan(isClicked = true)
-                loadSamplingSpan()
-            }
-
-            2 -> {
-                binding.rbModeCook.isChecked = false
-                binding.rbModeSampling.isChecked = true
-                loadCookSpan()
-                loadSamplingSpan(isClicked = true)
-            }
-
-            else -> {
-                binding.rbModeCook.isChecked = true
-                binding.rbModeSampling.isChecked = false
-                loadCookSpan(isClicked = true)
-                loadSamplingSpan()
-            }
-        }
-
-        binding.rbModeCook.setOnClickListener {
-            SpTool.put(SpTool.LAUNCH_PAGE_TYPE, 0)
-            binding.rbModeCook.isChecked = true
-            binding.rbModeSampling.isChecked = false
-            loadCookSpan(isClicked = true)
-            loadSamplingSpan()
-            startActivity<SelectDishActivity> { }
-            finish()
-        }
-        binding.rbModeSampling.setOnClickListener {
-            SpTool.put(SpTool.LAUNCH_PAGE_TYPE, 1)
-            binding.rbModeCook.isChecked = false
-            binding.rbModeSampling.isChecked = true
-            loadCookSpan()
-            loadSamplingSpan(isClicked = true)
-            startActivity<SamplingListActivity> { }
-            finish()
-        }
-        addWeighListener()
-        addGridItemListener()
-        loadSeasoning()
-    }
-
-    private fun addWeighListener() {
-        WeightUtil.addWeightListener(
-            weightKey = TAG,
-            getWeight = { address, state, weight ->
-            Log.d(TAG, "addWeighListener: address=$address,stat=$state,weight=$weight")
-            weightArray.put(address, weight)
-            val item = seasoningItems.firstOrNull { address == addressArray[it.sort] }
-            item?.let {
-                it.useWeight = weight.toDouble()
-                updateGridData(it)
-            }
-            Log.d(TAG, "addWeighListener: update-----------------------")
-        })
-    }
-
-    private var seasoningItems = mutableListOf<SeasoningEntity>()
-    private fun addGridItemListener() {
-        binding.include.root.forEach { child ->
-            child.clickWithDebounce {
-                val sort = child.tag.toString().toInt()
-                val entity = seasoningItems.firstOrNull { it.sort == sort } ?: SeasoningEntity()
-                clickGridItem(sort, entity)
-            }
-        }
-    }
-
-    val detector = MultiClickDetector(targetCount = 10, intervalMs = 800)
-
-    private fun defaultDataSettingDialog() {
-        val remindBinding = LayoutFoodRemindBinding.inflate(layoutInflater)
-        remindBinding.tvDialogTitle.text = "温馨提示"
-        remindBinding.tvDialogContent.text =
-            "您好，使用默认配置作为您的调料数据，则已有配置将被清除，确认吗？"
-        CommonDialog(this).apply {
-            messageView = remindBinding.root
-            leftText = "取消"
-            rightText = "确认"
-            onLeftClick = { dismiss() }
-            onRightClick = {
-                dismiss()
-                resetList()
-            }
-            onDismiss = { hideStatusBar() }
-        }.show()
-    }
-
-    private fun resetList() {
-        runCatching {
-            val record = JsonAssetsLoader.parseJsonFromAssets<ResetReasoningRecord>(
-                this,
-                "default_seasoning_list.json"
-            )
-//            val weightArray = WeightUtil.weightArray
-            appViewModel.clearAllSeasoning {
-                record?.list?.forEach { entity ->
-                    entity.useWeight = weightArray[addressArray[entity.sort]].toDouble()
-                    appViewModel.saveSeasoning(entity) {
-                        updateGridData(entity)
-                    }
-                }
+//
+//        binding.rbModeCook.setOnClickListener {
+//            SpTool.put(SpTool.LAUNCH_PAGE_TYPE, 0)
+//            binding.rbModeCook.isChecked = true
+//            binding.rbModeSampling.isChecked = false
+//            loadCookSpan(isClicked = true)
+//            loadSamplingSpan()
+//            startActivity<SelectDishActivity> {
+//                putExtra(SelectDishActivity.IS_CONFIG_PAGE, true)
+//            }
+//            finish()
+//        }
+//        binding.rbModeSampling.setOnClickListener {
+//            SpTool.put(SpTool.LAUNCH_PAGE_TYPE, 1)
+//            binding.rbModeCook.isChecked = false
+//            binding.rbModeSampling.isChecked = true
+//            loadCookSpan()
+//            loadSamplingSpan(isClicked = true)
+//            startActivity<SamplingListActivity> {
+//                putExtra(SamplingListActivity.IS_CONFIG_PAGE, true) }
+//            finish()
+//        }
+//        addWeighListener()
+//        addGridItemListener()
 //        loadSeasoning()
-            }
-        }.onFailure { it.printStackTrace() }
-    }
-
-    private fun initViewModel() {
-        val db = BaseApp.instance!!.database
-        val factory =
-            AppFactory(AppRepository(db.appDao()))
-        appViewModel =
-            ViewModelProvider(this, factory)[AppViewModel::class.java]
-    }
-
-    private fun loadSeasoning() {
-        appViewModel.loadSeasoning {
-            seasoningItems.clear()
-            seasoningItems.addAll(it)
-            initConfigData()
-            setGridData(seasoningItems)
-        }
-    }
-
-    private fun initConfigData() {
-        repeat(12) { num ->
-            val firstOne = seasoningItems.firstOrNull { it.sort == num }
-            if (firstOne == null) {
-                seasoningItems.add(SeasoningEntity().also { it.sort = num })
-            }
-        }
-    }
-
-    private fun setGridData(list: MutableList<SeasoningEntity>) {
-        val gridLayout = binding.include.root
-        list.forEach { entity ->
-            val tag = entity.sort.toString()
-            val frameLayout = gridLayout.findViewWithTag<FrameLayout>(tag)
-            TextCellAdapter.loadLayout(frameLayout, entity)
-        }
-    }
-
-    private fun updateGridData(entity: SeasoningEntity) {
-        val gridLayout = binding.include.root
-        val tag = entity.sort.toString()
-        val frameLayout = gridLayout.findViewWithTag<FrameLayout>(tag)
-        TextCellAdapter.loadLayout(frameLayout, entity)
-    }
-
-    private fun clickGridItem(sort: Int, entity: SeasoningEntity) {
-        val currentAddress = AddressUtil.getWeighAddressArray().get(sort)
-//        val seasoningEntity = list.first{it.sort == sort}
-        BottomDialog2(
-            weighIndex = sort,
-            weighAddress = currentAddress,
-            clickName = entity.goodsName
-        ).show(this) { item ->
-            syncItem(entity, item)
-            //3-调料
-            entity.materialType = 3
-            entity.sort = sort
-            saveSeasoning(entity) {
-                val tag = sort.toString()
-                val gridLayout = binding.include.root
-                val frameLayout = gridLayout.findViewWithTag<FrameLayout>(tag)
-                TextCellAdapter.loadLayout(frameLayout, entity)
-            }
-        }
-    }
-
-    private fun syncItem(oldItem: SeasoningEntity, newItem: SeasoningEntity) {
-        oldItem.run {
-            goodsId = newItem.goodsId
-            goodsName = newItem.goodsName
-            goodsOrRelationCode = newItem.goodsOrRelationCode
-            relateionType = newItem.relateionType
-            materialType = newItem.materialType
-            allEdible = newItem.allEdible
-            useWeight = newItem.useWeight
-            popularName = newItem.popularName
-            canteenId = newItem.canteenId
-            relateionType_dictText = newItem.relateionType_dictText
-
-            foodId = newItem.foodId
-            sort = newItem.sort
-        }
-    }
-
-    private fun loadQualitySpan(isClicked: Boolean = false, isEnable: Boolean = true) {
-        binding.rbModeQuality.text =
-            getModeTextSpan(
-                topText = modeList[2].modeName,
-                bottomText = modeList[2].modeDesc,
-                topColor = if (isEnable) if (isClicked) "#00BC71" else "#000000" else "#B4B4B4",
-                bottomColor = if (isEnable) "#8B8B8B" else "#B4B4B4"
-            )
-    }
-
-    private fun loadSamplingSpan(isClicked: Boolean = false, isEnable: Boolean = true) {
-        binding.rbModeSampling.text =
-            getModeTextSpan(
-                topText = modeList[1].modeName,
-                bottomText = modeList[1].modeDesc,
-                topColor = if (isEnable) if (isClicked) "#00BC71" else "#000000" else "#B4B4B4",
-                bottomColor = if (isEnable) "#8B8B8B" else "#B4B4B4"
-            )
-    }
-
-    private fun loadCookSpan(isClicked: Boolean = false, isEnable: Boolean = true) {
-        binding.rbModeCook.text =
-            getModeTextSpan(
-                topText = modeList[0].modeName,
-                bottomText = modeList[0].modeDesc,
-                topColor = if (isEnable) if (isClicked) "#00BC71" else "#000000" else "#B4B4B4",
-                bottomColor = if (isEnable) "#8B8B8B" else "#B4B4B4"
-            )
-    }
-
-    private fun getModeTextSpan(
-        topText: String,
-        topColor: String,
-        bottomText: String,
-        bottomColor: String
-    ): SpannableStringBuilder {
-
-
-        return buildSpannableString {
-            appendText(
-                topText,
-                ForegroundColorSpan(topColor.toColorInt()),
-                StyleSpan(Typeface.BOLD),
-                AbsoluteSizeSpan(36, true),
-                LineHeightSpan { text, start, end, spanstartv, v, fm ->
-                    fm.descent += 10.dp // 增加行间距
-                }
-            )
-            append("\n")
-            appendText(
-                bottomText,
-                ForegroundColorSpan(bottomColor.toColorInt()),
-                AbsoluteSizeSpan(26, true)
-            )
-        }
-    }
-
-    fun saveSeasoning(entity: SeasoningEntity, action: () -> Unit = {}) {
-        appViewModel.saveSeasoning(entity) {
-            action()
-            toast("保存成功")
-        }
-    }
-
-}
+//    }
+//
+//    private fun addWeighListener() {
+//        WeightUtil.addWeightListener(
+//            weightKey = TAG,
+//            getWeight = { address, state, weight ->
+//            Log.d(TAG, "addWeighListener: address=$address,stat=$state,weight=$weight")
+//            weightArray.put(address, weight)
+//            val item = seasoningItems.firstOrNull { address == addressArray[it.sort] }
+//            item?.let {
+//                it.useWeight = weight.toDouble()
+//                updateGridData(it)
+//            }
+//            Log.d(TAG, "addWeighListener: update-----------------------")
+//        })
+//    }
+//
+//    private var seasoningItems = mutableListOf<SeasoningEntity>()
+//    private fun addGridItemListener() {
+//        binding.include.root.forEach { child ->
+//            child.clickWithDebounce {
+//                val sort = child.tag.toString().toInt()
+//                val entity = seasoningItems.firstOrNull { it.sort == sort } ?: SeasoningEntity()
+//                clickGridItem(sort, entity)
+//            }
+//        }
+//    }
+//
+//    val detector = MultiClickDetector(targetCount = 10, intervalMs = 800)
+//
+//    private fun defaultDataSettingDialog() {
+//        CommonDialog(this)
+//            .setTitle("温馨提示")
+//            .setContent("您好，使用默认配置作为您的调料数据，则已有配置将被清除，确认吗？")
+//            .setNegativeButton("取消")
+//            .setPositiveButton("确认") { resetList() }
+//            .setOnDismissCallback { hideStatusBar() }
+//            .show()
+//    }
+//
+//    private fun resetList() {
+//        runCatching {
+//            val record = JsonAssetsLoader.parseJsonFromAssets<ResetReasoningRecord>(
+//                this,
+//                "default_seasoning_list.json"
+//            )
+////            val weightArray = WeightUtil.weightArray
+//            appViewModel.clearAllSeasoning {
+//                record?.list?.forEach { entity ->
+//                    entity.useWeight = weightArray[addressArray[entity.sort]].toDouble()
+//                    appViewModel.saveSeasoning(entity) {
+//                        updateGridData(entity)
+//                    }
+//                }
+////                loadSeasoning()
+//            }
+//        }.onFailure { it.printStackTrace() }
+//    }
+//
+//    private fun initViewModel() {
+//        val db = BaseApp.instance!!.database
+//        val factory =
+//            AppFactory(DbRepository(db.appDao()))
+//        appViewModel =
+//            ViewModelProvider(this, factory)[DbViewModel::class.java]
+//    }
+//
+//    private fun loadSeasoning() {
+//        appViewModel.loadSeasoning {
+//            seasoningItems.clear()
+//            seasoningItems.addAll(it)
+//            initConfigData()
+//            setGridData(seasoningItems)
+//        }
+//    }
+//
+//    private fun initConfigData() {
+//        repeat(12) { num ->
+//            val firstOne = seasoningItems.firstOrNull { it.sort == num }
+//            if (firstOne == null) {
+//                seasoningItems.add(SeasoningEntity().also { it.sort = num })
+//            }
+//        }
+//    }
+//
+//    private fun setGridData(list: MutableList<SeasoningEntity>) {
+//        Log.d(TAG, "setGridData:  ${list.toJsonString()}")
+//        val gridLayout = binding.include.root
+//        list.forEach { entity ->
+//            val tag = entity.sort.toString()
+//            val frameLayout = gridLayout.findViewWithTag<FrameLayout>(tag)
+//            TextCellAdapter.loadLayout(frameLayout, entity)
+//        }
+//    }
+//
+//    private fun updateGridData(entity: SeasoningEntity) {
+//        val gridLayout = binding.include.root
+//        val tag = entity.sort.toString()
+//        val frameLayout = gridLayout.findViewWithTag<FrameLayout>(tag)
+//        TextCellAdapter.loadLayout(frameLayout, entity)
+//    }
+//
+//    private fun clickGridItem(sort: Int, entity: SeasoningEntity) {
+//        val currentAddress = AddressUtil.getWeighAddressArray().get(sort)
+////        val seasoningEntity = list.first{it.sort == sort}
+//        SeasoningSearchDialog(
+//            activity = this,
+//            weighIndex = sort,
+//            weighAddress = currentAddress,
+//            clickName = entity.goodsName
+//        ) { item ->
+//            syncItem(entity, item)
+//            //3-调料
+//            entity.materialType = 3
+//            entity.sort = sort
+//            saveSeasoning(entity) {
+//                val tag = sort.toString()
+//                val gridLayout = binding.include.root
+//                val frameLayout = gridLayout.findViewWithTag<FrameLayout>(tag)
+//                TextCellAdapter.loadLayout(frameLayout, entity)
+//            }
+//        }.show()
+//    }
+//
+//    private fun syncItem(oldItem: SeasoningEntity, newItem: SeasoningEntity) {
+//        oldItem.run {
+//            goodsId = newItem.goodsId
+//            goodsName = newItem.goodsName
+//            goodsOrRelationCode = newItem.goodsOrRelationCode
+//            relateionType = newItem.relateionType
+//            materialType = newItem.materialType
+//            allEdible = newItem.allEdible
+//            useWeight = newItem.useWeight
+//            popularName = newItem.popularName
+//            canteenId = newItem.canteenId
+//            relateionType_dictText = newItem.relateionType_dictText
+//
+//            foodId = newItem.foodId
+//            sort = newItem.sort
+//        }
+//    }
+//
+//    private fun loadQualitySpan(isClicked: Boolean = false, isEnable: Boolean = true) {
+//        binding.rbModeQuality.text =
+//            getModeTextSpan(
+//                topText = modeList[2].modeName,
+//                bottomText = modeList[2].modeDesc,
+//                topColor = if (isEnable) if (isClicked) "#00BC71" else "#000000" else "#B4B4B4",
+//                bottomColor = if (isEnable) "#8B8B8B" else "#B4B4B4"
+//            )
+//    }
+//
+//    private fun loadSamplingSpan(isClicked: Boolean = false, isEnable: Boolean = true) {
+//        binding.rbModeSampling.text =
+//            getModeTextSpan(
+//                topText = modeList[1].modeName,
+//                bottomText = modeList[1].modeDesc,
+//                topColor = if (isEnable) if (isClicked) "#00BC71" else "#000000" else "#B4B4B4",
+//                bottomColor = if (isEnable) "#8B8B8B" else "#B4B4B4"
+//            )
+//    }
+//
+//    private fun loadCookSpan(isClicked: Boolean = false, isEnable: Boolean = true) {
+//        binding.rbModeCook.text =
+//            getModeTextSpan(
+//                topText = modeList[0].modeName,
+//                bottomText = modeList[0].modeDesc,
+//                topColor = if (isEnable) if (isClicked) "#00BC71" else "#000000" else "#B4B4B4",
+//                bottomColor = if (isEnable) "#8B8B8B" else "#B4B4B4"
+//            )
+//    }
+//
+//    private fun getModeTextSpan(
+//        topText: String,
+//        topColor: String,
+//        bottomText: String,
+//        bottomColor: String
+//    ): SpannableStringBuilder {
+//
+//
+//        return buildSpannableString {
+//            appendText(
+//                topText,
+//                ForegroundColorSpan(topColor.toColorInt()),
+//                StyleSpan(Typeface.BOLD),
+//                AbsoluteSizeSpan(36, true),
+//                LineHeightSpan { text, start, end, spanstartv, v, fm ->
+//                    fm.descent += 10.dp // 增加行间距
+//                }
+//            )
+//            append("\n")
+//            appendText(
+//                bottomText,
+//                ForegroundColorSpan(bottomColor.toColorInt()),
+//                AbsoluteSizeSpan(26, true)
+//            )
+//        }
+//    }
+//
+//    fun saveSeasoning(entity: SeasoningEntity, action: () -> Unit = {}) {
+//        appViewModel.saveSeasoning(entity) {
+//            action()
+//            toast("保存成功")
+//        }
+//    }
+//
+//}
@@ -5,22 +5,24 @@ import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import android.view.View
-import androidx.lifecycle.ViewModelProvider
+import androidx.activity.addCallback
+import androidx.activity.viewModels
+import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.shuwei.dish.match.R
 import com.shuwei.dish.match.adapter.DishPartAdapter
 import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.base.BaseApp
 import com.shuwei.dish.match.databinding.ActivityDishSamplingBinding
-import com.shuwei.dish.match.databinding.LayoutFoodRemindBinding
-import com.shuwei.dish.match.db.AppRepository
-import com.shuwei.dish.match.dialog.BottomDialog
+import com.shuwei.dish.match.dialog.FoodSearchDialog
 import com.shuwei.dish.match.dialog.CommonDialog
 import com.shuwei.dish.match.entity.CookFoodEntity
 import com.shuwei.dish.match.entity.CookFoodGoodsEntity
 import com.shuwei.dish.match.entity.FoodRecord
+import com.shuwei.dish.match.net.NetViewModel
 import com.shuwei.dish.match.utils.AddressUtil
 import com.shuwei.dish.match.utils.KeyboardUtil
+import com.shuwei.dish.match.utils.SwipeCallback
 import com.shuwei.dish.match.utils.WeightUtil
 import com.shuwei.dish.match.utils.ext.addOnActionSearchListener
 import com.shuwei.dish.match.utils.ext.clickWithDebounce
@@ -29,8 +31,6 @@ import com.shuwei.dish.match.utils.ext.startActivity
 import com.shuwei.dish.match.utils.ext.toJsonString
 import com.shuwei.dish.match.utils.ext.toast
 import com.shuwei.dish.match.utils.ext.visible
-import com.shuwei.dish.match.viewmodel.AppViewModel
-import com.shuwei.dish.match.viewmodel.factory.AppFactory
 import java.io.Serializable

 class DishSamplingActivity : BaseActivity() {
@@ -58,7 +58,6 @@ class DishSamplingActivity : BaseActivity() {
        setTitleBar()
        setHeaderBackground()
        addViewClickListener()
-        initViewModel()
        foodName = intent.getStringExtra(FOOD_NAME)
        binding.etInputDish.setText(foodName)

@@ -71,6 +70,7 @@ class DishSamplingActivity : BaseActivity() {
                    binding.tvDishPartWeight.text = "${weight}"
                }
            })
+        addBackKeyListener()
    }

    private fun setTitleBar() {
@@ -87,58 +87,47 @@ class DishSamplingActivity : BaseActivity() {
        }, backAction = {
            it.visible()
            it.setOnClickListener {
-                onBackPressed()
+                onBackPressedDispatcher.onBackPressed()
            }
        })
    }

-    private lateinit var appViewModel: AppViewModel

-    private fun initViewModel() {
-        val db = BaseApp.instance!!.database
-        val factory =
-            AppFactory(AppRepository(db.appDao()))
-        appViewModel =
-            ViewModelProvider(this, factory)[AppViewModel::class.java]
+
+    fun getCookFoodList() {
+        appViewModel.getCookFoodList(cookMode = 1)
    }

-    fun getCookFoodList(action: (MutableList<CookFoodEntity>?) -> Unit) {
-        appViewModel.getCookFoodList(cookMode = 1) { action(it) }
-    }
-
-    @Suppress("DEPRECATION")
-    @SuppressLint("GestureBackNavigation")
-    @Deprecated("Deprecated in Java")
-    override fun onBackPressed() {
+    /**
+     * 监听返回键
+     */
+    fun addBackKeyListener() {
+        onBackPressedDispatcher.addCallback(this) {
            if (list.isEmpty().not()) {
                //说明有新增的食材
                saveDataRemindDialog()
-            return
+                return@addCallback
            }
            if (pageFrom == HOME) {
                startActivity<SamplingListActivity>()
            }
-        super.onBackPressed()
+            onBackPressedDispatcher.onBackPressed()
+        }
    }

    private fun saveDataRemindDialog() {
-        val remindBinding = LayoutFoodRemindBinding.inflate(layoutInflater)
-        remindBinding.tvDialogTitle.text = "温馨提示"
-        remindBinding.tvDialogContent.text = "您好，当前页面存在未保存的数据，确认返回吗？"
-        CommonDialog(this).apply {
-            messageView = remindBinding.root
-            leftText = "取消"
-            rightText = "确认"
-            onLeftClick = { dismiss() }
-            onRightClick = {
-                dismiss()
+        CommonDialog(this)
+            .setTitle("温馨提示")
+            .setContent("您好，当前页面存在未保存的数据，确认返回吗？")
+            .setNegativeButton("取消")
+            .setPositiveButton("确认") {
                if (pageFrom == HOME) {
                    startActivity<SamplingListActivity>()
                }
                finish()
            }
-            onDismiss = { hideStatusBar() }
-        }.show()
+            .setOnDismissCallback { hideStatusBar() }
+            .show()
    }


@@ -165,6 +154,13 @@ class DishSamplingActivity : BaseActivity() {
            layoutManager =
                LinearLayoutManager(this@DishSamplingActivity, LinearLayoutManager.VERTICAL, false)
            adapter = dishAdapter
+            val itemTouchHelper = ItemTouchHelper(SwipeCallback(dishAdapter) { position ->
+                list.removeAt(position)
+                dishAdapter.notifyItemRemoved(position)
+                dishAdapter.notifyItemRangeChanged(position, list.size - position)
+                toast("已删除")
+            })
+            itemTouchHelper.attachToRecyclerView(this)
        }
        binding.etInputDishType.addOnActionSearchListener {
            searchDishType()
@@ -248,29 +244,31 @@ class DishSamplingActivity : BaseActivity() {
    }

    private fun jumpSearch(v: View) {
-        launch(Intent(this, FoodSearchActivity::class.java).apply {
+        val intent = Intent(this, FoodSearchActivity::class.java).apply {
            putExtra(FoodSearchActivity.FOOD_NAME, binding.etInputDish.text.toString().trim())
-        }) { intent ->
-            intent?.let {
-                foodId = it.getStringExtra(FoodSearchActivity.FOOD_ID)
-                foodName = it.getStringExtra(FoodSearchActivity.FOOD_NAME)
+        }
+        startActivity(intent) {
+            foodId = it?.getStringExtra(FoodSearchActivity.FOOD_ID)
+            foodName = it?.getStringExtra(FoodSearchActivity.FOOD_NAME)
            binding.etInputDish.run {
                setText(foodName)
                tag = foodName
                setSelection(text.length)
            }
        }
-        }
-        KeyboardUtil.hideKeyboard(v.context, v)
+        KeyboardUtil.hideKeyboard(v)
    }

    private fun searchDishType() {
        val inputText = binding.etInputDishType.text.toString().trim()
-        BottomDialog(goodsType = 0, defGoodsName = inputText).show(this@DishSamplingActivity) { item ->
+        FoodSearchDialog(
+            activity = this@DishSamplingActivity,
+            defGoodsName = inputText
+        ) { item ->
            val filterResult = list.firstOrNull { it.goodsName == item.goodsName }
            if (filterResult != null) {
                toast("不允许重复添加同一食材")
-                return@show
+                return@FoodSearchDialog
            }
            binding.etInputDishType.run {
                setText(item.goodsName)
@@ -283,10 +281,11 @@ class DishSamplingActivity : BaseActivity() {
                relateionType = item.relateionType ?: 0
                goodsOrRelationCode = item.goodsOrRelationCode

+                isNewDishType = true
                // TODO: 待定
                //allEdible = item.allEdible
            }
-        }
+        }.show()
    }

 }
@@ -0,0 +1,293 @@
+package com.shuwei.dish.match.ui
+
+import android.annotation.SuppressLint
+import android.content.Intent
+import android.os.Bundle
+import androidx.activity.addCallback
+import androidx.core.content.IntentCompat
+import androidx.recyclerview.widget.GridLayoutManager
+import com.shuwei.dish.match.adapter.GoodsInfoSearchAdapter
+import com.shuwei.dish.match.base.BaseActivity
+import com.shuwei.dish.match.databinding.ActivityFoodRecognizeBinding
+import com.shuwei.dish.match.dialog.FoodSearchDialog
+import com.shuwei.dish.match.entity.CookFoodGoodsEntity
+import com.shuwei.dish.match.utils.ActivityManager
+import com.shuwei.dish.match.utils.WeightUtil
+import com.shuwei.dish.match.utils.ext.clickWithDebounce
+import com.shuwei.dish.match.utils.ext.gone
+import com.shuwei.dish.match.utils.ext.visible
+import androidx.core.net.toUri
+
+/**
+ * 食材识别结果页面
+ * 展示识别到的食材照片、食材列表、选中食材名称及秤1重量
+ */
+class FoodRecognizeActivity : BaseActivity() {
+
+    companion object {
+        private const val TAG = "FoodRecognizeActivity"
+        private const val EXTRA_IMAGE_URI = "extra_image_uri"
+        private const val EXTRA_CURRENT_WEIGHT = "extra_current_weight"
+        const val EXTRA_SELECTED_ITEM = "extra_selected_item"
+        const val IS_MANUAL_CANCEL = "isManualCancel"
+
+        /** 内存缓存食材列表，避免通过 Intent 序列化传递大数据 */
+        private var pendingGoodsList: ArrayList<CookFoodGoodsEntity>? = null
+
+        /**
+         * 启动本页面，通过 onResult 回调返回用户选中的食材
+         * @param activity 宿主 Activity
+         * @param imageUri 食材照片路径（可为空）
+         * @param goodsList 识别到的食材列表
+         * @param finishCallback 页面关闭后回调，携带用户选中的食材（未选中时为 null）
+         */
+        fun start(
+            activity: BaseActivity,
+            imageUri: String? = null,
+            currentWeight: Double = 0.0,
+            goodsList: ArrayList<CookFoodGoodsEntity> = arrayListOf(),
+            finishCallback: (Boolean, CookFoodGoodsEntity?) -> Unit = { _, _ -> }
+        ) {
+            pendingGoodsList = goodsList
+            val launchIntent = Intent(activity, FoodRecognizeActivity::class.java).apply {
+                putExtra(EXTRA_IMAGE_URI, imageUri)
+                putExtra(EXTRA_CURRENT_WEIGHT, currentWeight)
+            }
+            activity.startActivity(launchIntent) { resultIntent ->
+                val isManualCancel = resultIntent?.getBooleanExtra(IS_MANUAL_CANCEL, false) ?: false
+                val entity = resultIntent?.let {
+                    IntentCompat.getSerializableExtra(
+                        it,
+                        EXTRA_SELECTED_ITEM,
+                        CookFoodGoodsEntity::class.java)
+                }
+                finishCallback(isManualCancel, entity)
+            }
+        }
+
+        /**
+         * 关闭当前识别页面，并将选中食材通过 Activity Result 回传
+         * 由外部（如重量归零时）调用
+         */
+        fun close() {
+            ActivityManager.getActivityStack()
+                .filterIsInstance<FoodRecognizeActivity>()
+                .lastOrNull()
+                ?.finishWithResult(false)
+        }
+    }
+
+    private lateinit var binding: ActivityFoodRecognizeBinding
+
+    private val list = mutableListOf<CookFoodGoodsEntity>()
+
+    /** 当前选中的列表位置，-1 表示无选中 */
+    private var selectedPosition = -1
+
+    /** 秤1当前实时重量 */
+    private var currentWeight = 0.0
+
+    /** 重量减少时延迟更新的任务，页面关闭前取消可防止用错误重量 */
+    private var pendingWeightRunnable: Runnable? = null
+
+    /** 当前待延迟更新的目标重量，避免相同重量重复重置计时器 */
+    private var pendingWeight = 0.0
+
+    private val adapter = GoodsInfoSearchAdapter(list).apply {
+        setOnItemClickListener { _, _, position ->
+            list.forEachIndexed { i, item -> item.isClicked = (i == position) }
+            // 点击选择时记录当前秤重量
+            list[position].useWeight = currentWeight
+            notifyDataSetChanged()
+            selectedPosition = position
+            binding.tvSelectedFood.text = list[position].goodsName ?: "-"
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityFoodRecognizeBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        registerWeightListener()
+        setHeaderBackground()
+
+        // 显示标题栏
+        setTitleBar(
+            titleBarAction = { it.visible() },
+            titleAction = { it.text = "食材识别" },
+            backAction = {
+                it.setOnClickListener {
+                    manualBack()
+                }
+            }
+        )
+
+        initData()
+        initRecyclerView()
+        initClickListeners()
+
+        onBackPressedDispatcher.addCallback(this) {
+            manualBack()
+        }
+    }
+
+    /**
+     * 手动返回
+     */
+    private fun manualBack() {
+        finishWithResult(true)
+    }
+
+    /**
+     * 从 Intent 读取数据并初始化页面
+     */
+    private fun initData() {
+        // 加载食材照片
+        val imageUri = intent.getStringExtra(EXTRA_IMAGE_URI)
+        if (!imageUri.isNullOrBlank()) {
+            binding.ivFoodPhoto.setImageURI(imageUri.toUri())
+        }
+        currentWeight = intent.getDoubleExtra(EXTRA_CURRENT_WEIGHT, 0.0)
+        binding.tvWeight.text = "${currentWeight}g"
+
+        // 取出内存缓存的食材列表，取用后立即清空
+        val goodsList = pendingGoodsList?.also { pendingGoodsList = null }
+        if (!goodsList.isNullOrEmpty()) {
+            list.addAll(goodsList)
+            // 默认选中第一项
+            selectedPosition = 0
+            list[0].isClicked = true
+            list[0].useWeight = currentWeight
+            binding.tvSelectedFood.text = list[0].goodsName ?: "-"
+        }
+    }
+
+    /**
+     * 初始化 RecyclerView
+     */
+    private fun initRecyclerView() {
+        binding.recyclerView.run {
+            layoutManager = GridLayoutManager(this@FoodRecognizeActivity, 2)
+            adapter = this@FoodRecognizeActivity.adapter
+        }
+        updateListVisibility()
+    }
+
+    /**
+     * 根据列表是否有数据控制 RecyclerView 显隐
+     */
+    private fun updateListVisibility() {
+        if (list.isEmpty()) {
+            binding.recyclerView.gone()
+        } else {
+            binding.recyclerView.visible()
+        }
+    }
+
+    /**
+     * 初始化按钮点击事件
+     */
+    private fun initClickListeners() {
+        // 更换食材：打开食材搜索弹窗
+        binding.btnChangeFood.clickWithDebounce {
+            val currentName = list.getOrNull(selectedPosition)?.goodsName
+            FoodSearchDialog(
+                activity = this,
+                defGoodsName = currentName,
+                onItemSelected = { item -> updateSelectedFood(item) }
+            ).show()
+        }
+
+        // 取消：关闭页面
+        binding.btnCancel.setOnClickListener { manualBack() }
+    }
+
+    /**
+     * 用新食材替换当前选中项（或追加到列表首位）
+     */
+    @SuppressLint("NotifyDataSetChanged")
+    private fun updateSelectedFood(item: CookFoodGoodsEntity) {
+        val existIndex = list.indexOfFirst { it.goodsId == item.goodsId }
+        if (existIndex >= 0) {
+            list.forEachIndexed { i, e -> e.isClicked = (i == existIndex) }
+            selectedPosition = existIndex
+        } else {
+            list.add(0, item)
+            list.forEachIndexed { i, e -> e.isClicked = (i == 0) }
+            selectedPosition = 0
+        }
+        adapter.notifyDataSetChanged()
+        binding.tvSelectedFood.text = item.goodsName ?: "-"
+        updateListVisibility()
+    }
+
+    /**
+     * 注册秤1重量监听
+     * 只有重量高于识别阈值时才更新选中食材的 useWeight，
+     * 低于阈值说明食材已被取走，保留上次有效值等待页面关闭
+     */
+    private fun registerWeightListener() {
+//        WeightUtil.addWeightListener(TAG) { address, state, weight ->
+//            if (address == AddressUtil.ONE && state == WeightUtil.STATE_STABLE) {
+//                runOnUiThread {
+//                    currentWeight = weight
+//                    binding.tvWeight.run {
+//                        if (tag != weight) {
+//                            text = "$weight g"
+//                            tag = weight
+//                        }
+//                    }
+//                    if (weight >= PrepareCookActivity.WEIGHT_RECOGNIZE_VALUE) {
+//                        adapter.items.firstOrNull { it.isClicked }?.let { item ->
+//                            if (pendingWeight != weight) {
+//                                // 无论增减，均延迟更新，避免手拿物品时的瞬时增重干扰
+//                                cancelPendingWeightUpdate()
+//                                pendingWeight = weight
+//                                pendingWeightRunnable = Runnable {
+//                                    item.useWeight = weight
+//                                    pendingWeightRunnable = null
+//                                }.also { handler.postDelayed(it, 3000) }
+//                            }
+//                        }
+//                    }
+//                }
+//            }
+//        }
+    }
+
+    /**
+     * 取消待执行的延迟重量更新任务
+     */
+    private fun cancelPendingWeightUpdate() {
+       // pendingWeightRunnable?.let { handler.removeCallbacks(it) }
+       // pendingWeightRunnable = null
+    }
+
+    /**
+     * 携带当前选中食材关闭页面
+     */
+    private fun finishWithResult(isManualCancel: Boolean) {
+        cancelPendingWeightUpdate()
+
+        val intent = Intent().apply {
+            putExtra(IS_MANUAL_CANCEL, isManualCancel)
+            if (isManualCancel.not()) {
+                list.getOrNull(selectedPosition)?.let {
+                    // 兜底：若 useWeight 仍为空或0，使用当前实时重量
+                    if ((it.useWeight ?: 0.0) <= 0.0) {
+                        it.useWeight = currentWeight
+                    }
+                    putExtra(EXTRA_SELECTED_ITEM, it)
+                }
+            }
+        }
+        setResult(RESULT_OK, intent)
+        finish()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        cancelPendingWeightUpdate()
+        WeightUtil.removeWeightListener(TAG)
+    }
+}
@@ -4,6 +4,9 @@ import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.shuwei.dish.match.R
 import com.shuwei.dish.match.adapter.FoodRecordAdapter
@@ -11,20 +14,16 @@ import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.base.BaseApp
 import com.shuwei.dish.match.databinding.ActivityFoodSearchBinding
 import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding
-
 import com.shuwei.dish.match.entity.FoodRecord
-import com.shuwei.dish.match.entity.FoodRecordBean
-import com.shuwei.dish.match.http.HttpUtil
-import com.shuwei.dish.match.http.UrlConfig
+import com.shuwei.dish.match.net.UiState
 import com.shuwei.dish.match.utils.KeyboardUtil
 import com.shuwei.dish.match.utils.ext.addOnActionSearchListener
 import com.shuwei.dish.match.utils.ext.gone
 import com.shuwei.dish.match.utils.ext.startActivity
-import com.shuwei.dish.match.utils.ext.toJsonString
-import com.shuwei.dish.match.utils.ext.toObject
 import com.shuwei.dish.match.utils.ext.toast
 import com.shuwei.dish.match.utils.ext.visible
 import java.io.Serializable
+import kotlinx.coroutines.launch

 class FoodSearchActivity : BaseActivity() {

@@ -40,7 +39,7 @@ class FoodSearchActivity : BaseActivity() {

    private var list: MutableList<FoodRecord> = mutableListOf()
    private var pageType = 0
-    private var dinnerType = "0"
+    private var dinnerType = "1"
    private val recordAdapter by lazy {
        FoodRecordAdapter(list).apply {
            isStateViewEnable = true
@@ -89,13 +88,38 @@ class FoodSearchActivity : BaseActivity() {
            adapter = recordAdapter
        }
        addViewListener()
+        initObserver()
+    }
+
+    /**
+     * 收集 searchFoodState，统一处理 Loading / Success / Error 状态
+     */
+    private fun initObserver() {
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                netViewModel.searchFoodState.collect { state ->
+                    when (state) {
+                        is UiState.Loading -> showLoading()
+                        is UiState.Success -> handleSearchResult(state.data)
+                        is UiState.Error -> {
+                            delayDismissLoading()
+                            finishRefresh()
+                            binding.refreshLayout.setEnableRefresh(true)
+                            toast(state.msg)
+                            if (pageNo == 1) loadEmptyView()
+                        }
+                        is UiState.Idle -> {}
+                    }
+                }
+            }
+        }
    }

    private fun addViewListener() {
        binding.ivDishSearch.setOnClickListener { v ->
            pageNo = 1
            getInputAndSearch()
-            KeyboardUtil.hideKeyboard(v.context, v)
+            KeyboardUtil.hideKeyboard(v)
        }
        binding.refreshLayout.setEnableRefresh(true)
        binding.refreshLayout.setEnableLoadMore(false)
@@ -112,13 +136,13 @@ class FoodSearchActivity : BaseActivity() {
            queryListInfo(foodName!!)
        }
        binding.root.setOnClickListener { v ->
-            KeyboardUtil.hideKeyboard(v.context, v)
+            KeyboardUtil.hideKeyboard(v)
        }
        binding.etInputDish.let { v ->
            v.addOnActionSearchListener {
                pageNo = 1
                getInputAndSearch()
-                KeyboardUtil.hideKeyboard(v.context, v)
+                KeyboardUtil.hideKeyboard( v)
            }
        }
    }
@@ -134,7 +158,7 @@ class FoodSearchActivity : BaseActivity() {
    }

    private var pageNo = 1
-    private var pageSize = 100
+    private var pageSize = 10
    fun getDinnerTypeText(): String {
        return when (dinnerType) {
            "1" -> "早餐"
@@ -143,65 +167,39 @@ class FoodSearchActivity : BaseActivity() {
            else -> "早餐"
        }
    }
+
    @SuppressLint("NotifyDataSetChanged")
    private fun queryListInfo(input: String) {
-        showLoading()
-        val map = mutableMapOf(
+        val map = mutableMapOf<String, Any>(
            "foodName" to input.trim(),
-            "pageNo" to "$pageNo",
-            "pageSize" to "$pageSize",
-            "canteenId" to BaseApp.canteenId
+            "pageNum" to pageNo,
+            "pageSize" to pageSize,
+            "placeId" to BaseApp.canteenId,
+            "dinnerType" to getDinnerTypeText()
        )
-        if (dinnerType.toInt() > 0) {
-            map["dinnerType"] = getDinnerTypeText()
+        netViewModel.searchFoodList(param = map)
    }
-        val sb = StringBuilder(UrlConfig.QUERY_FOOD_LIST).apply {
-            append("?")
-            map.forEach { (key, value) -> append("$key=$value&") }
-        }
-        sb.deleteCharAt(sb.length - 1)
-        HttpUtil.get(
-            url = sb.toString(),
-            doSuccess = {
+
+    /**
+     * 处理搜索结果，填充列表或展示空视图
+     */
+    @SuppressLint("NotifyDataSetChanged")
+    private fun handleSearchResult(records: MutableList<FoodRecord>?) {
        delayDismissLoading()
        finishRefresh()
-                binding.refreshLayout.run {
-                    setEnableRefresh(true)
+        binding.refreshLayout.setEnableRefresh(true)
+        if (records.isNullOrEmpty()) {
+            if (pageNo == 1) loadEmptyView()
+            return
        }
-                val json = it.toJsonString()
-                val recordBean: FoodRecordBean? = json.toObject<FoodRecordBean>()
-                if (recordBean == null || recordBean.records.isNullOrEmpty()) {
-//                    toast("暂未搜索到相关菜品信息")
-                    if (pageNo == 1) {
-                        loadEmptyView()
-                    }
-                    return@get
-                }
-                val records = recordBean.records
-                if (pageNo == 1) {
-                    list.clear()
-                }
-                list.addAll(records!!)
+        if (pageNo == 1) list.clear()
+        list.addAll(records)
        recordAdapter.notifyDataSetChanged()
        val isLoadMoreEnable = records.size >= pageSize
        binding.refreshLayout.setEnableLoadMore(isLoadMoreEnable)
-                if (isLoadMoreEnable) {
-                    pageNo++
-                }
-            },
-            doFailure = { code, msg ->
-                binding.refreshLayout.run {
-                    setEnableRefresh(true)
-                }
-                toast(msg)
-                delayDismissLoading()
-                finishRefresh()
-                if (pageNo == 1) {
-                    loadEmptyView()
-                }
-            }
-        )
+        if (isLoadMoreEnable) pageNo++
    }
+
    private fun finishRefresh() {
        if (pageNo == 1) {
            binding.refreshLayout.finishRefresh(1200)
@@ -211,12 +209,17 @@ class FoodSearchActivity : BaseActivity() {
    }

    private var emptyViewBinding: LayoutEmptyViewBinding? = null
+
    @SuppressLint("NotifyDataSetChanged")
    private fun loadEmptyView() {
        list.clear()
        recordAdapter.notifyDataSetChanged()
        if (emptyViewBinding == null) {
-            emptyViewBinding = LayoutEmptyViewBinding.inflate(LayoutInflater.from(this), binding.rvDishSearchList, false)
+            emptyViewBinding = LayoutEmptyViewBinding.inflate(
+                LayoutInflater.from(this),
+                binding.rvDishSearchList,
+                false
+            )
        }
        emptyViewBinding!!.tvContent.text = "暂无数据"
        emptyViewBinding!!.tvSubContent.text = "可以尝试换个名称重新搜索"
@@ -2,22 +2,19 @@ package com.shuwei.dish.match.ui

 import android.annotation.SuppressLint
 import android.os.Bundle
-import androidx.lifecycle.ViewModelProvider
+import androidx.activity.addCallback
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.shuwei.dish.match.R
 import com.shuwei.dish.match.adapter.HomeModeAdapter
 import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.base.BaseApp
 import com.shuwei.dish.match.databinding.ActivityHomeBinding
-import com.shuwei.dish.match.db.AppRepository
 import com.shuwei.dish.match.entity.HomeModeBean
-import com.shuwei.dish.match.http.HttpUtil
 import com.shuwei.dish.match.utils.SpTool
-import com.shuwei.dish.match.utils.WeightUtil
 import com.shuwei.dish.match.utils.ext.startActivity
 import com.shuwei.dish.match.utils.ext.toast
-import com.shuwei.dish.match.viewmodel.AppViewModel
-import com.shuwei.dish.match.viewmodel.factory.AppFactory
+import kotlinx.coroutines.launch

 class HomeActivity : BaseActivity() {

@@ -33,7 +30,6 @@ class HomeActivity : BaseActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        statusBarDarkFont(enable = true)
-        initViewModel()
 //        // 获取 ANDROID_ID
 //        val deviceId =
 //            Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID)
@@ -50,6 +46,7 @@ class HomeActivity : BaseActivity() {
                BaseApp.canteenId = "0"
            }
        }
+        onBackPressedDispatcher.addCallback(this) {}
 //        binding.radioGroup.check(R.id.radioZk)
        initRecyclerView()
 //        HttpUtil.getAppToken()
@@ -107,7 +104,7 @@ class HomeActivity : BaseActivity() {
                modeDesc = "菜品快速制作，记录熟重",
                modeIconId = R.drawable.ic_mode_cook,
                onClick = {
-                    SpTool.put(SpTool.LAUNCH_PAGE_TYPE, 0)
+                    SpTool.cookMode = 0
                    startActivity<SelectDishActivity>()
                    finish()
                })
@@ -118,7 +115,7 @@ class HomeActivity : BaseActivity() {
                modeDesc = "菜品快速制作，记录熟重",
                modeIconId = R.drawable.ic_mode_sampling,
                onClick = {
-                    SpTool.put(SpTool.LAUNCH_PAGE_TYPE, 1)
+                    SpTool.cookMode = 1
                    goSampling()
                })
        )
@@ -134,44 +131,30 @@ class HomeActivity : BaseActivity() {
        )
    }

-    private lateinit var appViewModel: AppViewModel

-    private fun initViewModel() {
-        val db = BaseApp.instance!!.database
-        val factory = AppFactory(AppRepository(db.appDao()))
-        appViewModel = ViewModelProvider(this, factory)[AppViewModel::class.java]
-    }

    private fun goSampling() {
-        appViewModel.loadSeasoning {
-            if (it.isEmpty()) {
-                //无调料信息打开采样历史列表页面，点击设置配置调料信息
+        lifecycleScope.launch {
+            val slots = appViewModel.loadSeasoningSlot()
+            if (slots.isEmpty()) {
+                // 无调料信息，打开采样历史列表页面，点击设置配置调料信息
                startActivity<SamplingListActivity>()
                finish()
-                return@loadSeasoning
+                return@launch
            }
-            appViewModel.countCookFood(cookMode = 1) { count ->
+            val count = appViewModel.countCookFood(cookMode = 1)
            if (count > 0) {
-                    //有烹饪中数据打开采样历史列表页面
+                // 有烹饪中数据，打开采样历史列表页面
                startActivity<SamplingListActivity>()
                finish()
-                    return@countCookFood
+                return@launch
            }
-                //无烹饪数据打开新增采样页面
-                startActivity<DishSamplingActivity> {
-                    putExtra(DishSamplingActivity.PAGE_FROM, DishSamplingActivity.HOME)
+            // 无烹饪数据，打开新增采样页面
+            startActivity<PrepareCookActivity> {
+                putExtra(PrepareCookActivity.PAGE_FROM, PrepareCookActivity.HOME)
            }
            finish()
        }
    }
-    }
-
-    @Deprecated("Deprecated in Java")
-    @SuppressLint("GestureBackNavigation", "MissingSuperCall")
-    override fun onBackPressed() {
-        //super.onBackPressed()
-        //当前页面不允许返回
-        //dialog = toast("不允许返回操作")
-    }

 }
@@ -1,34 +1,32 @@
 package com.shuwei.dish.match.ui

 import android.annotation.SuppressLint
+import android.content.Intent
+import android.graphics.Color
 import android.os.Bundle
-import android.provider.Settings
-import android.util.Log
-import androidx.lifecycle.ViewModelProvider
+import android.os.SystemClock
+import android.view.KeyEvent
+import android.view.animation.RotateAnimation
+import androidx.activity.addCallback
+import androidx.core.graphics.toColorInt
 import androidx.lifecycle.lifecycleScope
 import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.base.BaseApp
+import com.shuwei.dish.match.base.DeviceRole
+import com.shuwei.dish.match.base.GlobalData
 import com.shuwei.dish.match.databinding.ActivityInitBinding
-import com.shuwei.dish.match.db.AppRepository
-import com.shuwei.dish.match.http.HttpUtil
-import com.shuwei.dish.match.http.UrlConfig
+import com.shuwei.dish.match.objbox.FoodModule
+import com.shuwei.dish.match.scale.ScaleServiceManager
 import com.shuwei.dish.match.utils.AppUtil
-import com.shuwei.dish.match.utils.QRCodeUtil
+import com.shuwei.dish.match.utils.NetworkUtils
 import com.shuwei.dish.match.utils.SpTool
+import com.shuwei.dish.match.utils.Weigher2
 import com.shuwei.dish.match.utils.WeightUtil
-import com.shuwei.dish.match.utils.ext.dp
-import com.shuwei.dish.match.utils.ext.invisible
+import com.shuwei.dish.match.utils.ext.gone
 import com.shuwei.dish.match.utils.ext.startActivity
-import com.shuwei.dish.match.utils.ext.toJsonString
-import com.shuwei.dish.match.utils.ext.toObject
-import com.shuwei.dish.match.utils.ext.toast
 import com.shuwei.dish.match.utils.ext.visible
-import com.shuwei.dish.match.viewmodel.AppViewModel
-import com.shuwei.dish.match.viewmodel.factory.AppFactory
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.launch
-import kotlin.toString

 class InitActivity : BaseActivity() {
    companion object {
@@ -36,71 +34,44 @@ class InitActivity : BaseActivity() {
    }

    private lateinit var binding: ActivityInitBinding
-    private lateinit var appViewModel: AppViewModel
+    private var startTime = 0L // 倒计时开始时间
+    private var lastNetworkCheckTime = 0L // 上次检测网络的时间

    @SuppressLint("HardwareIds")
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
+        addBackKeyListener()
        statusBarDarkFont(enable = true)
 //        useBackground(false)
        binding = ActivityInitBinding.inflate(layoutInflater)
        setContentView(binding.root)
-
+        lifecycleScope.launch {
+            FoodModule.init(this@InitActivity)
+        }
 //        setHeaderBackground(isHomePage = true)
        setHeaderBgVisible(false)
        BaseApp.appVersion = AppUtil.getAppVersionCode(this).toString()

-        // 获取 ANDROID_ID
-        var androidId =
-            Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID)
-        androidId = "39a7abdd06b3c7ab"
-        BaseApp.deviceId = androidId
-        SpTool.put(SpTool.DEVICE_ID, androidId)
-        BaseApp.configUrl = UrlConfig.BASE_URL
        BaseApp.canteenId = "0"
-//        // TODO:  以上保存deviceId用于临时使用，后续改为下面注释方式

-//        var deviceId = AppUtil.getUDID(this)
-//        Log.d(TAG, "onCreate: deviceId=$deviceId")
-////        deviceId = "39a7abdd06b3c7ab"
-//        deviceId = "3ea47dc0-3cf0-3c2f-909c-265a9a65572e"
-////        deviceId = "6ce7cd59-b875-38b2-b73d-88a570be3212"
-//
-//        BaseApp.deviceId = deviceId
-//
-//        SpTool.put(SpTool.DEVICE_ID, deviceId)
-//        val deviceConfigCache = SpTool.getString(SpTool.DEVICE_CONFIG_CACHE)
-//        val checkResult = checkConfigData(deviceConfigCache)
-//        if (checkResult.not()) {
-//            binding.ivQrCode.visible()
-//            binding.btnInit.visible()
-//            //进行初始化操作
-//            initConfig()
-//            return
-//        }
-
-        binding.ivQrCode.invisible()
-        binding.btnInit.invisible()
-
-        initViewModel()
        WeightUtil.init()
        WeightUtil.getWeight()
        WeightUtil.startContinuousRead()
-        HttpUtil.getAppToken()

-        HttpUtil.loopGetToken = true
-        countDown()
+        initViews()
    }

-    private fun initViewModel() {
-        val db = BaseApp.instance!!.database
-        val factory = AppFactory(AppRepository(db.appDao()))
-        appViewModel = ViewModelProvider(this, factory)[AppViewModel::class.java]
-    }

-    private fun startNextPage() {
-        val launchPageType = SpTool.getInt(SpTool.LAUNCH_PAGE_TYPE, -1)
-        when (launchPageType) {
+    private fun startNextPage(withDelay: Boolean = false) {
+        lifecycleScope.launch {
+            if (withDelay) delay(2000)
+            // 子设备：直接进入小屏专属页面，不走原有大屏业务流程
+            if (GlobalData.deviceRole == DeviceRole.SLAVE) {
+                startActivity<SlaveActivity>()
+                return@launch
+            }
+            // 主设备：走原有路由逻辑
+            when (SpTool.cookMode) {
                0 -> {
                    startActivity<SelectDishActivity>()
                }
@@ -114,114 +85,160 @@ class InitActivity : BaseActivity() {
                }
            }
        }
+    }

    private fun goSampling() {
-        appViewModel.loadSeasoning {
-            if (it.isEmpty()) {
-                //无调料信息打开采样历史列表页面，点击设置配置调料信息
-                startActivity<SamplingListActivity>()
-//                finish()
-                return@loadSeasoning
-            }
-            appViewModel.countCookFood(cookMode = 1) { count ->
-                if (count > 0) {
-                    //有烹饪中数据打开采样历史列表页面
-                    startActivity<SamplingListActivity>()
-//                    finish()
-                    return@countCookFood
-                }
-                //无烹饪数据打开新增采样页面
-                startActivity<DishSamplingActivity> {
-                    putExtra(DishSamplingActivity.PAGE_FROM, DishSamplingActivity.HOME)
-                }
-//                finish()
-            }
-        }
-    }
-
-    private fun countDown() {
        lifecycleScope.launch {
-            flow {
-                (2 downTo 1).forEach {
-                    delay(1000)
-                    emit(it)
+            val slots = appViewModel.loadSeasoningSlot()
+            if (slots.isEmpty()) {
+                // 无调料信息，打开采样历史列表页面，点击设置配置调料信息
+                startActivity<SamplingListActivity>()
+                return@launch
            }
-            }.collect {
-                // 倒计时结束执行跳转
-                if (it == 1) {
-                    startNextPage()
-                    //保留初始化页面，不关闭
-//                    finish()
+            val count = appViewModel.countCookFood(cookMode = 1)
+            if (count > 0) {
+                // 有烹饪中数据，打开采样历史列表页面
+                startActivity<SamplingListActivity>()
+                return@launch
+            }
+            // 无烹饪数据，打开新增采样页面
+            startActivity<PrepareCookActivity> {
+                putExtra(PrepareCookActivity.PAGE_FROM, PrepareCookActivity.HOME)
            }
        }
    }
-    }
-
-    private fun initConfig() {
-        binding.ivQrCode.setImageBitmap(
-            QRCodeUtil.generateQRCode(
-                content = BaseApp.deviceId?:"",
-                size = 200.dp
-            )
-        )
-        binding.btnInit.setOnClickListener {
-            HttpUtil.loopGetToken = false
-            getDeviceConfig()
-        }
-    }
-
-    private fun getDeviceConfig() {
-        val tokenUrl = "${UrlConfig.DEVICE_TOKEN}?qrcodeId=${BaseApp.deviceId}&appVersion=${BaseApp.appVersion}"
-        HttpUtil.get(url = tokenUrl, doSuccess = { token ->
-            Log.d(TAG, "initConfig: $token")
-            getConfig(token.toString())
-        }, doFailure = { code, msg ->
-            Log.d(TAG, "initConfig: $code,$msg")
-        })
-    }
-    private fun getConfig(token: String) {
-        val deviceConfigUrl = "${UrlConfig.DEVICE_CONFIG}?equipmentCode=${BaseApp.deviceId}&&appVersion=${BaseApp.appVersion}"
-        HttpUtil.get(url = deviceConfigUrl, header = mutableMapOf(
-            "X-Access-Token" to token
-        ), doSuccess = {
-            Log.d(TAG, "getDeviceConfig: $it")
-            val data = it.toJsonString()
-            val checkResult = checkConfigData(data)
-            if (checkResult.not()) {
-                toast("初始化设备失败，请稍后重试")
-                return@get
-            }
-            HttpUtil.loopGetToken = true
-            SpTool.put(SpTool.DEVICE_CONFIG_CACHE, data)
-            startActivity<HomeActivity>()
-//            finish()
-        }, doFailure = { code, msg ->
-            Log.d(TAG, "getDeviceConfig: $code,$msg")
-            toast("初始化设备失败，请稍后重试，code=${code},msg=${msg}")
-        })
-    }
-
-    data class DeviceConfigBean(
-        var appPackageUrl:String? = null,
-        var canteenId:String? = null
-    )
-
-    private fun checkConfigData(data: String): Boolean {
-        if (data.isBlank()) {
-            return false
-        }
-        val config = data.toObject<DeviceConfigBean?>()
-        if (config == null) {
-            return false
-        }
-        BaseApp.configUrl = config.appPackageUrl?:""
-        BaseApp.canteenId = config.canteenId?:""
-        return true
-    }

    override fun onDestroy() {
        WeightUtil.stopContinuousRead()
+        ScaleServiceManager.stop()
        super.onDestroy()
    }

+
+    /**
+     * 初始化控件事件
+     */
+    private fun initViews() {
+        // 连接网络按钮点击事件
+        binding.btnConnectNetwork.setOnClickListener {
+            openNetworkSettings()
+        }
+    }
+
+    /**
+     * 启动加载动画 - ImageView 持续旋转
+     */
+    private fun startLoadingAnimation() {
+        val rotateAnimation = RotateAnimation(
+            0f, 360f,
+            RotateAnimation.RELATIVE_TO_SELF, 0.5f,
+            RotateAnimation.RELATIVE_TO_SELF, 0.5f
+        ).apply {
+            duration = 1200 // 旋转周期 1.2 秒
+            repeatCount = RotateAnimation.INFINITE // 无限循环
+            repeatMode = RotateAnimation.RESTART
+        }
+        binding.ivLoading.startAnimation(rotateAnimation)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        if (NetworkUtils.isNetworkConnected(this)) {
+            // 有网络时隐藏网络检测区域，直接跳转
+            binding.llNetwork.gone()
+            startNextPage(withDelay = false)
+            return
+        }
+        binding.llNetwork.visible()
+        startCountdown()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        // 页面不可见时停止倒计时
+        handler.removeCallbacksAndMessages(null)
+    }
+
+    /**
+     * 启动 60 秒倒计时
+     */
+    private fun startCountdown() {
+        startTime = SystemClock.elapsedRealtime()
+        lastNetworkCheckTime = 0
+//        binding.llNetwork.setBackgroundColor(Color.TRANSPARENT)
+        binding.llLoading.visible()
+        binding.llNetworkButton.gone()
+        binding.tvCountdown.text = "60秒"
+        // 无网络时才启动加载动画
+        startLoadingAnimation()
+        scheduleCountdown()
+    }
+
+    /**
+     * 定时更新倒计时
+     * 使用 SystemClock.elapsedRealtime() 确保精确计时
+     */
+    private fun scheduleCountdown() {
+        handler.postDelayed({
+            val elapsedTime = SystemClock.elapsedRealtime() - startTime
+            val remainingTime = 60 - (elapsedTime / 1000).toInt()
+            val currentNetworkCheckTime = (elapsedTime / 1000).toInt()
+
+            // 每 10 秒检测一次网络
+            if (currentNetworkCheckTime > 0 && currentNetworkCheckTime % 10 == 0 && currentNetworkCheckTime != lastNetworkCheckTime.toInt()) {
+                lastNetworkCheckTime = currentNetworkCheckTime.toLong()
+                checkNetworkConnection()
+            }
+
+            // 倒计时未结束，继续更新 UI
+            if (remainingTime > 0) {
+                binding.tvCountdown.text = "${remainingTime}秒"
+                scheduleCountdown()
+            } else {
+                // 倒计时结束，最后检测一次网络
+                if (NetworkUtils.isNetworkConnected(this)) {
+                    startNextPage()
+                } else {
+                    // 网络未连接，显示"连接网络"按钮
+                    showNetworkButton()
+                }
+            }
+        }, 100) // 每 100ms 检查一次，确保精确性
+    }
+
+    /**
+     * 检测网络连接
+     */
+    private fun checkNetworkConnection() {
+        if (NetworkUtils.isNetworkConnected(this)) {
+            // 网络连接成功，停止倒计时并跳转到 HomeActivity
+            handler.removeCallbacksAndMessages(null)
+            startNextPage()
+        }
+    }
+
+
+    /**
+     * 显示"连接网络"按钮
+     */
+    private fun showNetworkButton() {
+//        binding.llNetwork.setBackgroundColor("#5C77F7".toColorInt())
+        binding.llLoading.gone()
+        binding.llNetworkButton.visible()
+    }
+
+    /**
+     * 打开系统网络设置页面
+     */
+    private fun openNetworkSettings() {
+        val intent = Intent(android.provider.Settings.ACTION_WIFI_SETTINGS)
+        startActivity(intent) {}
+    }
+
+    private fun addBackKeyListener() {
+        onBackPressedDispatcher.addCallback(this) {
+            // 禁用返回键，不执行任何操作
+        }
+    }
+
 }
@@ -0,0 +1,485 @@
+package com.shuwei.dish.match.ui
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.view.updateLayoutParams
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.chad.library.adapter4.BaseMultiItemAdapter
+import com.chad.library.adapter4.viewholder.QuickViewHolder
+import com.google.android.flexbox.AlignItems
+import com.google.android.flexbox.FlexDirection
+import com.google.android.flexbox.FlexWrap
+import com.google.android.flexbox.FlexboxLayoutManager
+import com.shuwei.dish.match.R
+import com.shuwei.dish.match.adapter.Seasoning18GridAdapter
+import com.shuwei.dish.match.adapter.Seasoning22GridAdapter
+import com.shuwei.dish.match.base.BaseActivity
+import com.shuwei.dish.match.dialog.CommonDialog
+import com.shuwei.dish.match.databinding.ActivityMasterScaleBinding
+import com.shuwei.dish.match.databinding.ListTypeScale1Binding
+import com.shuwei.dish.match.databinding.ListTypeScale18Binding
+import com.shuwei.dish.match.databinding.ListTypeScale2Binding
+import com.shuwei.dish.match.databinding.ListTypeScale22Binding
+import com.shuwei.dish.match.base.BaseApp
+import com.shuwei.dish.match.databinding.ListItemScale22RowBinding
+import com.shuwei.dish.match.scale.ScaleData
+import com.shuwei.dish.match.scale.ScaleDeviceConfig
+import com.shuwei.dish.match.scale.ScaleServiceManager
+import com.shuwei.dish.match.utils.NetworkUtil
+import com.shuwei.dish.match.utils.SizeTool
+import com.shuwei.dish.match.utils.WeightUtil
+import com.shuwei.dish.match.utils.ext.dp
+import com.shuwei.dish.match.utils.ext.toast
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+private const val VIEW_TYPE_SCALE2 = 0
+private const val VIEW_TYPE_SCALE22 = 1
+private const val VIEW_TYPE_SCALE18 = 2
+private const val VIEW_TYPE_SCALE1 = 3
+
+/**
+ * 主设备秤数据总览页面
+ * 按设备分组展示，每种设备对应独立的 item 布局和 viewType
+ */
+class MasterScaleActivity : BaseActivity() {
+
+    private lateinit var binding: ActivityMasterScaleBinding
+    private val size by lazy { SizeTool.getFlexLayoutSize(10.dp) }
+
+    private data class DeviceGroup(
+        val deviceId: String,
+        val ip: String,
+        val scales: List<ScaleData>
+    )
+
+    private val groupList = mutableListOf<DeviceGroup>()
+    private val adapter = DeviceGroupAdapter(groupList)
+
+    /** key = "$deviceId#$address"，value = 调料名称，用于注入 ScaleData.name */
+    private val slotNameMap = mutableMapOf<String, String>()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityMasterScaleBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        setHeaderBackground()
+
+        binding.ivMasterBack.setOnClickListener { finish() }
+        binding.rvScaleList.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this)
+        binding.rvScaleList.itemAnimator = null
+        binding.rvScaleList.adapter = adapter
+
+        loadSlotNames()
+    }
+
+    /** 从 Room 加载槽位配置到 slotNameMap，加载完成后启动数据观测 */
+    private fun loadSlotNames() {
+        lifecycleScope.launch {
+            val slots = appViewModel.loadSeasoningSlot()
+            slots.forEach { slot ->
+                slotNameMap["${slot.deviceId}#${slot.address}"] = slot.goodsName
+            }
+            observeScaleData()
+        }
+    }
+
+    /** 用 slotNameMap 为 ScaleData 注入名称 */
+    private fun ScaleData.withSlotName(): ScaleData {
+        val name = slotNameMap["$deviceId#$address"]
+        return if (name != null) copy(name = name) else this
+    }
+
+    private fun observeScaleData() {
+        val flow = ScaleServiceManager.allScales ?: return
+        lifecycleScope.launch {
+            flow.collectLatest { scaleMap ->
+                val localId = com.shuwei.dish.match.base.GlobalData.deviceId
+                val localIp = NetworkUtil.getLocalIpAddress(this@MasterScaleActivity)
+                val groups = scaleMap.values
+                    .groupBy { it.deviceId }
+                    .entries
+                    .sortedWith(compareBy { entry ->
+                        ScaleDeviceConfig.DEVICE_ORDER.indexOf(entry.key)
+                            .let { if (it == -1) Int.MAX_VALUE else it }
+                    })
+                    .map { (deviceId, scales) ->
+                        DeviceGroup(
+                            deviceId = deviceId,
+                            ip = if (deviceId == localId) localIp
+                            else scales.firstOrNull { it.ip.isNotEmpty() }?.ip ?: "",
+                            scales = scales.map { it.withSlotName() }.sortedBy { it.address }
+                        )
+                    }
+
+                val structureChanged = groups.size != groupList.size ||
+                        groups.indices.any { groups[it].deviceId != groupList[it].deviceId }
+
+                if (structureChanged) {
+                    updateList(groups)
+                } else {
+                    groups.forEach { group ->
+                        adapter.updateScalesForDevice(
+                            group.deviceId,
+                            group.scales
+                        )
+                    }
+                }
+
+                updateStatusBar(scaleMap)
+            }
+        }
+    }
+
+    private fun updateList(groups: List<DeviceGroup>) {
+        if (groupList.isEmpty()) {
+            groupList.addAll(groups)
+            adapter.notifyDataSetChanged()
+            return
+        }
+        // 精确 diff，只 notify 真正变化的 item，避免全量刷新打断触摸事件
+        groups.forEachIndexed { i, group ->
+            if (i < groupList.size) {
+                if (groupList[i] != group) {
+                    groupList[i] = group
+                    adapter.notifyItemChanged(i)
+                }
+            } else {
+                groupList.add(group)
+                adapter.notifyItemInserted(i)
+            }
+        }
+        while (groupList.size > groups.size) {
+            groupList.removeAt(groupList.lastIndex)
+            adapter.notifyItemRemoved(groupList.size)
+        }
+    }
+
+    @SuppressLint("SetTextI18n")
+    private fun updateStatusBar(scaleMap: Map<String, ScaleData>) {
+        val deviceCount = scaleMap.values.map { it.deviceId }.distinct().size
+        val scaleCount = scaleMap.size
+        binding.tvConnectionStatus.text = "已发现设备：$deviceCount 台 / 共 $scaleCount 个秤"
+    }
+
+    private inner class DeviceGroupAdapter(data: MutableList<DeviceGroup>) :
+        BaseMultiItemAdapter<DeviceGroup>(data) {
+
+        private val scale1VHMap = mutableMapOf<String, Scale1VH>()
+        private val scale2VHMap = mutableMapOf<String, Scale2VH>()
+        private val scale22VHMap = mutableMapOf<String, Scale22VH>()
+        private val scale18VHMap = mutableMapOf<String, Scale18VH>()
+
+        fun updateScalesForDevice(deviceId: String, scales: List<ScaleData>) {
+            scale1VHMap[deviceId]?.updateScales(scales)
+            scale2VHMap[deviceId]?.updateScales(scales)
+            scale22VHMap[deviceId]?.updateScales(scales)
+            scale18VHMap[deviceId]?.updateScales(scales)
+        }
+
+        init {
+            addItemType(
+                VIEW_TYPE_SCALE2,
+                object :
+                    BaseMultiItemAdapter.OnMultiItemAdapterListener<DeviceGroup, QuickViewHolder> {
+                    override fun onCreate(context: Context, parent: ViewGroup, viewType: Int) =
+                        QuickViewHolder(
+                            ListTypeScale2Binding.inflate(
+                                LayoutInflater.from(context),
+                                parent,
+                                false
+                            ).root
+                        )
+
+                    override fun onBind(
+                        holder: QuickViewHolder,
+                        position: Int,
+                        item: DeviceGroup?
+                    ) {
+                        item ?: return
+                        val b = ListTypeScale2Binding.bind(holder.itemView)
+                        val vh = Scale2VH(b)
+                        scale2VHMap[item.deviceId] = vh
+                        vh.bind(item)
+                    }
+                })
+            addItemType(
+                VIEW_TYPE_SCALE22,
+                object :
+                    BaseMultiItemAdapter.OnMultiItemAdapterListener<DeviceGroup, QuickViewHolder> {
+                    override fun onCreate(context: Context, parent: ViewGroup, viewType: Int) =
+                        QuickViewHolder(
+                            ListTypeScale22Binding.inflate(
+                                LayoutInflater.from(context),
+                                parent,
+                                false
+                            ).root
+                        )
+
+                    override fun onBind(
+                        holder: QuickViewHolder,
+                        position: Int,
+                        item: DeviceGroup?
+                    ) {
+                        item ?: return
+                        val b = ListTypeScale22Binding.bind(holder.itemView)
+                        // 每次 onBind 时注册/更新 VH 缓存，后续数据更新直接走 VH，不再触发 notify
+                        val vh = Scale22VH(b)
+                        scale22VHMap[item.deviceId] = vh
+                        vh.bind(item)
+                    }
+                })
+            addItemType(
+                VIEW_TYPE_SCALE18,
+                object :
+                    BaseMultiItemAdapter.OnMultiItemAdapterListener<DeviceGroup, QuickViewHolder> {
+                    override fun onCreate(context: Context, parent: ViewGroup, viewType: Int) =
+                        QuickViewHolder(
+                            ListTypeScale18Binding.inflate(
+                                LayoutInflater.from(context),
+                                parent,
+                                false
+                            ).root
+                        )
+
+                    override fun onBind(
+                        holder: QuickViewHolder,
+                        position: Int,
+                        item: DeviceGroup?
+                    ) {
+                        item ?: return
+                        val b = ListTypeScale18Binding.bind(holder.itemView)
+                        val vh = Scale18VH(b)
+                        scale18VHMap[item.deviceId] = vh
+                        vh.bind(item)
+                    }
+                })
+            addItemType(
+                VIEW_TYPE_SCALE1,
+                object :
+                    BaseMultiItemAdapter.OnMultiItemAdapterListener<DeviceGroup, QuickViewHolder> {
+                    override fun onCreate(context: Context, parent: ViewGroup, viewType: Int) =
+                        QuickViewHolder(
+                            ListTypeScale1Binding.inflate(
+                                LayoutInflater.from(context),
+                                parent,
+                                false
+                            ).root
+                        )
+
+                    override fun onBind(
+                        holder: QuickViewHolder,
+                        position: Int,
+                        item: DeviceGroup?
+                    ) {
+                        item ?: return
+                        val b = ListTypeScale1Binding.bind(holder.itemView)
+                        val vh = Scale1VH(b)
+                        scale1VHMap[item.deviceId] = vh
+                        vh.bind(item)
+                    }
+                })
+            onItemViewType { position, list ->
+                when (list.getOrNull(position)?.deviceId) {
+                    ScaleDeviceConfig.DEVICE_ID_2 -> VIEW_TYPE_SCALE2
+                    ScaleDeviceConfig.DEVICE_ID_22 -> VIEW_TYPE_SCALE22
+                    ScaleDeviceConfig.DEVICE_ID_18 -> VIEW_TYPE_SCALE18
+                    else -> VIEW_TYPE_SCALE1
+                }
+            }
+        }
+    }
+
+    // ── ViewHolder: 2个秤 ──────────────────────────────────────────────────
+
+    private inner class Scale2VH(val b: ListTypeScale2Binding) : RecyclerView.ViewHolder(b.root) {
+
+        @SuppressLint("SetTextI18n")
+        fun bind(group: DeviceGroup) {
+            b.tvDeviceIp.text = "IP：${group.ip.ifEmpty { "未知" }}"
+            b.tvDeviceLabel.text = "设备：${group.deviceId}"
+            // 两个格子显示秤地址行，隐藏重量/状态（showAddress 通过 visibility 控制）
+            listOf(b.cell1, b.cell2).forEach { cell ->
+                cell.tvAddress.visibility = android.view.View.VISIBLE
+                cell.tvWeight.visibility = android.view.View.VISIBLE
+                cell.tvState.visibility = android.view.View.VISIBLE
+                cell.root.setOnClickListener {
+                    val s = cell.root.tag as? ScaleData ?: return@setOnClickListener
+                    showTareDialog(deviceId = s.deviceId, ip = s.ip, address = s.address)
+                }
+            }
+            updateScales(group.scales)
+        }
+
+        fun updateScales(scales: List<ScaleData>) {
+            bindCell(b.cell1, scales.getOrNull(0))
+            bindCell(b.cell2, scales.getOrNull(1))
+        }
+
+        @SuppressLint("SetTextI18n")
+        private fun bindCell(cell: ListItemScale22RowBinding, scale: ScaleData?) {
+            cell.root.tag = scale
+            cell.tvAddress.run {
+                text = scale?.let { "秤${it.address}" } ?: ""
+                textSize = 18f
+            }
+            cell.tvName.run {
+                text = if (scale?.address == 1) "净材" else "熟食"
+                textSize = 22f
+            }
+            cell.tvWeight.run {
+                text = scale?.let { "${it.weight}g" } ?: ""
+                textSize = 22f
+            }
+            cell.tvState.run {
+                text = stateStr(scale?.state)
+                textSize = 22f
+            }
+            cell.root.updateLayoutParams { height = 400.dp }
+        }
+    }
+
+    // ── ViewHolder: 22个秤 ─────────────────────────────────────────────────
+
+    private inner class Scale22VH(val b: ListTypeScale22Binding) : RecyclerView.ViewHolder(b.root) {
+        private var innerAdapter: Seasoning22GridAdapter? = null
+
+        @SuppressLint("SetTextI18n")
+        fun bind(group: DeviceGroup) {
+            b.tvDeviceIp.text = "IP：${group.ip.ifEmpty { "未知" }}"
+            b.tvDeviceLabel.text = "设备：${group.deviceId}"
+
+            if (innerAdapter == null) {
+                b.rvScales.layoutParams = b.rvScales.layoutParams.also { it.height = size.rvHeight }
+                b.rvScales.layoutManager = FlexboxLayoutManager(b.root.context).apply {
+                    flexDirection = FlexDirection.COLUMN
+                    flexWrap = FlexWrap.WRAP
+                    alignItems = AlignItems.FLEX_START
+                }
+                b.rvScales.itemAnimator = null
+                innerAdapter = Seasoning22GridAdapter(
+                    size.largeSize,
+                    size.smallSize,
+                    showNameOnly = false,
+                    showAddress = true
+                ).apply {
+                    onItemClick = { scale, _ ->
+                        showTareDialog(
+                            deviceId = scale.deviceId,
+                            ip = scale.ip,
+                            address = scale.address
+                        )
+                    }
+                }
+                b.rvScales.adapter = innerAdapter
+            }
+            updateScales(group.scales)
+        }
+
+        /** 仅更新秤数据，不触发外层任何 notify */
+        fun updateScales(scales: List<ScaleData>) {
+            innerAdapter?.updateByAddress(scales)
+        }
+    }
+
+    // ── ViewHolder: 18个秤 ─────────────────────────────────────────────────
+
+    private inner class Scale18VH(val b: ListTypeScale18Binding) : RecyclerView.ViewHolder(b.root) {
+        private var innerAdapter: Seasoning18GridAdapter? = null
+
+        @SuppressLint("SetTextI18n")
+        fun bind(group: DeviceGroup) {
+            b.tvDeviceIp.text = "IP：${group.ip.ifEmpty { "未知" }}"
+            b.tvDeviceLabel.text = "设备：${group.deviceId}"
+
+            if (innerAdapter == null) {
+                val gridLayoutManager = GridLayoutManager(b.root.context, 6).apply {
+                    spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
+                        override fun getSpanSize(position: Int) = 1
+                    }
+                }
+                b.rvScales.layoutManager = gridLayoutManager
+                b.rvScales.itemAnimator = null
+                innerAdapter =
+                    Seasoning18GridAdapter(showNameOnly = false, showAddress = true).apply {
+                        onItemClick = { scale, _ ->
+                            showTareDialog(
+                                deviceId = scale.deviceId,
+                                ip = scale.ip,
+                                address = scale.address
+                            )
+                        }
+                    }
+                b.rvScales.adapter = innerAdapter
+            }
+            updateScales(group.scales)
+        }
+
+        /** 仅更新秤数据，不触发外层任何 notify */
+        fun updateScales(scales: List<ScaleData>) {
+            innerAdapter?.updateByAddress(scales)
+        }
+    }
+
+    // ── ViewHolder: 1个秤 ──────────────────────────────────────────────────
+
+    private inner class Scale1VH(val b: ListTypeScale1Binding) : RecyclerView.ViewHolder(b.root) {
+
+        init {
+            b.llScaleContainer.setOnClickListener {
+                val scale = b.llScaleContainer.tag as? ScaleData ?: return@setOnClickListener
+                showTareDialog(deviceId = scale.deviceId, ip = scale.ip, address = scale.address)
+            }
+        }
+
+        @SuppressLint("SetTextI18n")
+        fun bind(group: DeviceGroup) {
+            b.tvDeviceIp.text = "IP：${group.ip.ifEmpty { "未知" }}"
+            b.tvDeviceLabel.text = "设备：${group.deviceId}"
+            updateScales(group.scales)
+        }
+
+        fun updateScales(scales: List<ScaleData>) {
+            val scale = scales.firstOrNull()
+            b.llScaleContainer.tag = scale
+            b.tvAddr.text = scale?.let { "秤 ${it.address}" } ?: ""
+            b.tvName.text = scale?.name?.takeIf { it.isNotBlank() } ?: "-"
+            b.tvWeight.text = scale?.let { "${it.weight} g" } ?: ""
+            b.tvState.text = stateStr(scale?.state)
+        }
+    }
+
+    // ── 工具方法 ───────────────────────────────────────────────────────────
+
+    private fun stateStr(state: Int?) = when (state) {
+        WeightUtil.STATE_STABLE -> "稳定"
+        WeightUtil.STATE_UNSTABLE -> "不稳定"
+        WeightUtil.STATE_OVER_WEIGHT -> "超量"
+        null -> ""
+        else -> "$state"
+    }
+
+    /**
+     * 弹出清零确认对话框
+     * @param deviceId 目标设备 ID
+     * @param ip       设备 IP
+     * @param address  目标秤地址
+     */
+    private fun showTareDialog(deviceId: String, ip: String, address: Int) {
+        CommonDialog(this)
+            .setTitle("清零确认")
+            .setContent("设备 IP：${ip.ifEmpty { "未知" }}\n确认对秤 $address 执行清零操作？")
+            .setNegativeButton("取消")
+            .setPositiveButton("确认") {
+                val sent = ScaleServiceManager.sendTare(deviceId, address)
+                if (!sent) toast("设备未连接，清零失败")
+            }
+            .show()
+    }
+
+}
@@ -2,34 +2,49 @@ package com.shuwei.dish.match.ui

 import android.annotation.SuppressLint
 import android.content.Intent
-import android.graphics.Typeface
+import android.net.Uri
 import android.os.Bundle
 import android.util.Log
+import android.view.View
+import android.view.ViewGroup
+import androidx.activity.addCallback
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.shuwei.dish.match.R
 import com.shuwei.dish.match.adapter.DishPartAdapter
 import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.databinding.ActivityPrepareCookBinding
-import com.shuwei.dish.match.databinding.LayoutFoodRemindBinding
-import com.shuwei.dish.match.dialog.BottomDialog
+import com.shuwei.dish.match.databinding.LayoutCameraPreviewBinding
 import com.shuwei.dish.match.dialog.CommonDialog
 import com.shuwei.dish.match.entity.CookFoodEntity
 import com.shuwei.dish.match.entity.CookFoodGoodsEntity
 import com.shuwei.dish.match.entity.FoodRecord
-import com.shuwei.dish.match.http.HttpUtil
-import com.shuwei.dish.match.http.UrlConfig
+import com.shuwei.dish.match.net.UiState
+import com.shuwei.dish.match.objbox.FoodModule
 import com.shuwei.dish.match.utils.AddressUtil
+import com.shuwei.dish.match.utils.CameraUtils
+import com.shuwei.dish.match.utils.ImageUtil
+import com.shuwei.dish.match.utils.KeyboardUtil
+import com.shuwei.dish.match.utils.SpTool
 import com.shuwei.dish.match.utils.SwipeCallback
 import com.shuwei.dish.match.utils.WeightUtil
+import com.shuwei.dish.match.utils.ext.addOnActionSearchListener
 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.toJsonString
-import com.shuwei.dish.match.utils.ext.toObject
 import com.shuwei.dish.match.utils.ext.toast
 import com.shuwei.dish.match.utils.ext.visible
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.io.Serializable
+import java.util.concurrent.atomic.AtomicBoolean
+import kotlin.math.abs

@SuppressLint("NotifyDataSetChanged")
 class PrepareCookActivity : BaseActivity() {
@@ -37,12 +52,25 @@ class PrepareCookActivity : BaseActivity() {
    companion object {
        const val TAG = "CookActivity"
        const val FOOD_ITEM = "foodItem"
+        const val FOOD_NAME = "foodName"
+        const val PAGE_FROM = "pageFrom"
+        const val HOME = "home"
+        const val WEIGHT_CHANGE_VALUE = 15
+        const val WEIGHT_RECOGNIZE_VALUE = 10
    }

    private lateinit var binding: ActivityPrepareCookBinding

+    private val cameraUtils: CameraUtils by lazy { CameraUtils(this) }
+
    private var food: FoodRecord? = null

+    /** 采集模式下通过搜索页回填的 foodId */
+    private var foodId: String? = null
+
+    /** 来源页面标识，HOME 时返回跳转 SamplingListActivity */
+    private var pageFrom: String? = null
+
    private var goodsList: MutableList<CookFoodGoodsEntity>? = null

    @Suppress("DEPRECATION")
@@ -51,106 +79,166 @@ class PrepareCookActivity : BaseActivity() {
        binding = ActivityPrepareCookBinding.inflate(layoutInflater)
        setContentView(binding.root)
        setHeaderBackground()
+        pageFrom = intent.getStringExtra(PAGE_FROM)
+        food = intent.extras?.getSerializable(FOOD_ITEM) as FoodRecord?
+
+        val isSamplingMode = SpTool.cookMode == 1
+        val titleText = if (isSamplingMode) "菜品采集" else "菜品制作"
        setTitleBar(titleBarAction = {
            it.visible()
        }, titleAction = {
-            it.text = "菜品制作"
+            it.text = titleText
        }, rightIconActon = {
            it.gone()
-            it.setImageResource(R.drawable.ic_setting)
-            it.setOnClickListener {
-                //startActivity<DeviceSettingActivity>()
-            }
        }, backAction = {
            it.setOnClickListener {
-                onBackPressed()
+                onBackPressedDispatcher.onBackPressed()
            }
        })
-        food = intent.extras?.getSerializable(FOOD_ITEM) as FoodRecord?
-        binding.tvDishName.text = food?.foodName ?: ""
+
+        // 根据 cookMode 设置搜索栏可编辑性
+        if (isSamplingMode) {
+            // 采集模式：可编辑，支持搜索
+            val foodName = intent.getStringExtra(FOOD_NAME)
+            binding.etInputDish.setText(foodName ?: food?.foodName ?: "")
+            binding.ivDishSearch.visible()
+        } else {
+            // 制作模式：不可编辑，仅展示菜名
+            binding.etInputDish.setText(food?.foodName ?: "")
+            binding.etInputDish.isFocusable = false
+            binding.etInputDish.isFocusableInTouchMode = false
+            binding.ivDishSearch.gone()
+        }
+
        addViewClickListener()
+        addBackKeyListener()
+        initCamera(binding.flCameraContainer)
+        initRecyclerView()
+        initObserver()
+
+        if (!isSamplingMode) {
            getDishDetail()
        }
+    }

    private fun addViewClickListener() {
        WeightUtil.addWeightListener(
            weightKey = TAG,
            getWeight = { address, state, weight ->
-                //Log.d(TAG, "addViewClickListener: address=$address,state=$state,weight=$weight")
-                if (address == AddressUtil.ONE) {
-                    binding.tvDishPartWeight.text = "${weight}"
+                if (address == AddressUtil.ONE && state == WeightUtil.STATE_STABLE) {
+                    runOnUiThread {
+                        recognizeFood(weight)
+                    }
                }
            })
-        binding.ivWeightClear.setOnClickListener {
-            WeightUtil.tareTwo(AddressUtil.ONE)
-        }
-        binding.ivWeightAdd.setOnClickListener {
-            if (clickIndex == -1) {
-                toast("请选择菜品构成")
-                return@setOnClickListener
-            }
-            val clickItem = list[clickIndex]
-            clickItem.run {
-                if (isNewDishType && materialType != 1 && materialType != 2) {
-                    toast("请选择主辅材类型")
-                    return@setOnClickListener
-                }
-            }
-            val weight = binding.tvDishPartWeight.text.toString().toDouble()
-            if (weight <= 0.toDouble()) {
-                toast("食材用量需要大于0")
-                return@setOnClickListener
-            }
-            Log.d(TAG, "addViewClickListener->useRealWeight=$weight")
-            clickItem.run {
-                useWeight = weight.toDouble()
-                isSetFinished = true
-                dishPartAdapter.notifyItemChanged(clickIndex)
-            }
-        }
-        binding.tvAddFood.clickWithDebounce {
-            BottomDialog(goodsType = 0).show(this) { item ->
-                val filterResult = list.firstOrNull { it.goodsId == item.goodsId }
-                if (filterResult != null) {
-                    toast("不允许重复添加同一食材")
-                    return@show
-                }
-                list.add(CookFoodGoodsEntity().apply {
-                    goodsId = item.goodsId
-                    goodsName = item.goodsName
-//                    materialType =
-                    isNewDishType = true
-                })
-                onItemClick(list.size - 1)
-            }
+
+        if (SpTool.cookMode == 1) {
+            // 采集模式：绑定搜索栏交互
+            binding.ivDishSearch.setOnClickListener { v -> jumpSearch(v) }
+            binding.etInputDish.addOnActionSearchListener { jumpSearch(binding.etInputDish) }
        }
+
        binding.btnCook.clickWithDebounce {
+            if (SpTool.cookMode == 1) {
+                // 采集模式：从输入框创建 FoodRecord
+                val showFoodName = binding.etInputDish.text.toString().trim()
+                if (showFoodName.isBlank()) {
+                    toast("菜品名称为空")
+                    return@clickWithDebounce
+                }
+                if (list.isEmpty()) {
+                    toast("菜品构成信息未设置")
+                    return@clickWithDebounce
+                }
+                val foodRecord = FoodRecord()
+                binding.etInputDish.let {
+                    if (it.tag != null && it.tag.toString() == it.text.toString()) {
+                        foodRecord.foodId = foodId
+                    }
+                }
+                foodRecord.foodName = showFoodName
+                foodRecord.cookMode = 1
+                Log.d(TAG, "goToSubmit: goodsList:${list.toJsonString()}")
+                startActivity<SubmitFoodActivity> {
+                    putExtra(SubmitFoodActivity.GOODS_LIST, list as Serializable)
+                    putExtra(SubmitFoodActivity.FOOD_ITEM, foodRecord as Serializable)
+                }
+            } else {
+                // 制作模式：检查食材是否全部设置完成
                val count = list.count { it.isSetFinished.not() }
                if (count > 0) {
                    showRemindDialog()
                    return@clickWithDebounce
                }
-            goToSubmit()
+                openSubmitPage()
            }
-        binding.rgCook.setOnCheckedChangeListener { group, checkedId ->
-            val tempType =
-                if (checkedId == R.id.rbDishTypeFirst) 1 else if (checkedId == R.id.rbDishTypeSecond) 2 else -1
-            list[clickIndex].materialType = tempType
-            dishPartAdapter.notifyItemChanged(clickIndex)
-
-            binding.tvDishType.text =
-                if (tempType == 1) "主材" else if (tempType == 2) "辅材" else ""
        }
    }

-    private fun goToSubmit() {
+    private val isTakingPhoto = AtomicBoolean(false)
+    // 识别成功并查询到数据打开识别页面
+    private var showRecognizePage = false
+
+    // 页面可见时允许识别，onPause 后禁止，onResume 后恢复
+    private var pageVisible = true
+    // 手动取消标识
+    private var manualCancelFlag = false
+    private var lastPhotoUri: Uri? = null
+    private var lastWeight = 0.0
+    private var currentWeight = 0.0
+
+    /**
+     * 重量稳定时触发菜品识别
+     * @param weight 当前稳定重量
+     */
+    private fun recognizeFood(weight: Double) {
+        this.currentWeight = weight
+        if (weight < WEIGHT_RECOGNIZE_VALUE) {
+            showRecognizePage = false
+            manualCancelFlag = false
+            lastWeight = weight
+            FoodRecognizeActivity.close()
+            return
+        }
+        if (!pageVisible || manualCancelFlag || isTakingPhoto.get() || showRecognizePage || abs(lastWeight - weight) <= WEIGHT_CHANGE_VALUE) {
+            return
+        }
+        isTakingPhoto.set(true)
+        cameraUtils.takePhoto(
+            succCallback = cameraSuccessCallback,
+            failCallback = cameraFailureCallback
+        )
+    }
+
+    /**
+     * 菜品选择回调
+     * - list 中不含该 goodsId：直接新增，isNewDishType = true
+     * - list 中已含该 goodsId：累加 useWeight
+     */
+    private val foodSelectCallback: (CookFoodGoodsEntity) -> Unit = { entity ->
+        val existing = list.firstOrNull { it.goodsId == entity.goodsId }
+        if (existing != null) {
+            existing.useWeight = (existing.useWeight ?: 0.0) + (entity.useWeight ?: 0.0)
+            existing.isSetFinished = true
+            dishPartAdapter.notifyItemChanged(list.indexOf(existing))
+        } else {
+            list.add(entity.also {
+                it.isNewDishType = true
+                it.isSetFinished = true
+            })
+            val position = list.size - 1
+            dishPartAdapter.notifyItemInserted(position)
+            binding.rvDishPartList.smoothScrollToPosition(position)
+        }
+    }
+
+    private fun openSubmitPage() {
        getGoodsList()
        if (goodsList.isNullOrEmpty()) {
-            toast("菜品构成信息未设置")
+            toast("无菜品构成信息")
            return
        }
        Log.d(TAG, "goToSubmit: goodsList:${goodsList?.toJsonString()}")
-//        startActivity<SubmitDishActivity> {
        startActivity<SubmitFoodActivity> {
            putExtra(SubmitFoodActivity.GOODS_LIST, goodsList as Serializable)
            putExtra(SubmitFoodActivity.FOOD_ITEM, food as Serializable)
@@ -161,8 +249,7 @@ class PrepareCookActivity : BaseActivity() {
        if (goodsList == null) {
            goodsList = mutableListOf()
        }
-        list.forEach {
-            if (it.isSetFinished) {
+        list.filter { it.isSetFinished }.forEach {
            goodsList?.add(CookFoodGoodsEntity().apply {
                foodId = food!!.foodId
                goodsId = it.goodsId
@@ -175,94 +262,107 @@ class PrepareCookActivity : BaseActivity() {
            })
        }
    }
-    }

    private fun showRemindDialog() {
-        val remindBinding = LayoutFoodRemindBinding.inflate(layoutInflater)
-        CommonDialog(this).apply {
-            messageView = remindBinding.root
-            leftText = "返回调整"
-            rightText = "确认无误"
-            onLeftClick = { dismiss() }
-            onRightClick = {
-                goToSubmit()
-                dismiss()
-            }
-            onDismiss = { hideStatusBar() }
-        }.show()
+        CommonDialog(this)
+            .setTitle("温馨提示")
+            .setNegativeButton("返回调整")
+            .setPositiveButton("确认无误") { openSubmitPage() }
+            .setOnDismissCallback { hideStatusBar() }
+            .show()
    }


-    private fun getDishDetail() {
-        //649
-        val url = "${UrlConfig.DISH_DETAIL}?foodId=${food?.foodId}"
-        HttpUtil.get(
-            url = url,
-            doSuccess = {
-                val json = it.toJsonString()
-                Log.d(TAG, "getDishDetail: json:$json")
-                val detail: CookFoodEntity? = json.toObject<CookFoodEntity>()
+    private fun initObserver() {
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                netViewModel.foodDetailState.collect { state ->
+                    when (state) {
+                        is UiState.Success -> {
+                            val detail = state.data
                            if (detail == null) {
                                toast("查询菜品信息为空")
-                    return@get
+                                return@collect
                            }
                            loadDishDetail(detail)
-            }) { code, msg ->
-            toast(msg)
+                        }
+
+                        is UiState.Error -> toast(state.msg)
+                        else -> {}
+                    }
+                }
+            }
        }
    }

+    private fun getDishDetail() {
+//        //649
+//        val url = "${UrlConfig.DISH_DETAIL}?foodId=${food?.foodId}"
+//        HttpUtil.get(
+//            url = url,
+//            doSuccess = {
+//                val json = it.toJsonString()
+//                Log.d(TAG, "getDishDetail: json:$json")
+//                val detail: CookFoodEntity? = json.toObject<CookFoodEntity>()
+//                if (detail == null) {
+//                    toast("查询菜品信息为空")
+//                    return@get
+//                }
+//                loadDishDetail(detail)
+//            }) { code, msg ->
+//            toast(msg)
+//        }
+
+        netViewModel.getFoodDetail(food?.foodId ?: "")
+    }
+
+
    private fun loadDishDetail(detail: CookFoodEntity) {
-        val voList = detail.stFoodInfoConstituteList
+//        val voList = detail.stFoodInfoConstituteList
+        val voList = detail.foodConstituteList
        if (voList.isNullOrEmpty()) {
            return
        }
        //筛选出主材和辅材
-        val tempDate = voList.filter { it.materialType == 1 || it.materialType == 2 }
+        val tempData = voList.filter { it.materialType == 1 || it.materialType == 2 }
            .apply {
                forEach { it.useWeight = 0.toDouble() }
            }
        list.clear()
-        list.addAll(tempDate)
        firstReqSize = list.size
-        initRecyclerView()
+        list.addAll(tempData)
+        dishPartAdapter.notifyDataSetChanged()
    }

    private var firstReqSize = 0
    private val list = mutableListOf<CookFoodGoodsEntity>()
    private val dishPartAdapter by lazy {
-        DishPartAdapter(list).apply {
+        DishPartAdapter(list = list).apply {
            setOnItemClickListener { _, _, positon ->
-                onItemClick(positon)
+                list.forEachIndexed { index, entity ->
+                    entity.isItemClicked = index == positon
+                }
+                notifyDataSetChanged()
+            }
+            addOnItemChildClickListener(R.id.ivClearIcon) { _, _, positon ->
+                Log.d(TAG, "onFoodItemClick: ${list[positon].toJsonString()}")
+                if (list[positon].isOriginalData) {
+                    list[positon].run {
+                        isNewDishType = false
+                        useWeight = 0.0
+                        isSetFinished = false
+                    }
+                    notifyItemChanged(positon)
+                    return@addOnItemChildClickListener
+                }
+                removeAt(positon)
            }
        }
    }

-    private fun onItemClick(positon: Int) {
-        this@PrepareCookActivity.clickIndex = positon
-        list[clickIndex].let { it ->
-            binding.tvDishShowName.run {
-                text = it.goodsName
-                setTypeface(typeface, Typeface.BOLD)
-            }
-            binding.tvDishType.text =
-                if (it.materialType == 1) "主材" else if (it.materialType == 2) "辅材" else ""
-            list.forEach { bean -> bean.isItemClicked = false }
-            it.isItemClicked = true
-            dishPartAdapter.notifyDataSetChanged()
-
-            if (it.isNewDishType) {
-                binding.dividerDishType.visible()
-                binding.llDishType.visible()
-            } else {
-                binding.dividerDishType.gone()
-                binding.llDishType.gone()
-            }
-        }
-    }
-
-    private var clickIndex = -1
-
+    /**
+     * RecyclerView初始化
+     */
    private fun initRecyclerView() {
        binding.rvDishPartList.run {
            layoutManager =
@@ -274,7 +374,6 @@ class PrepareCookActivity : BaseActivity() {
                    dishPartAdapter.notifyItemChanged(position)
                    return@SwipeCallback
                }
-//                dishPartAdapter.removeAt(position)
                list.removeAt(position)
                dishPartAdapter.notifyItemRemoved(position)
                dishPartAdapter.notifyItemRangeChanged(position, list.size - position)
@@ -284,39 +383,178 @@ class PrepareCookActivity : BaseActivity() {
        }
    }

-    @Suppress("DEPRECATION")
-    @SuppressLint("GestureBackNavigation")
-    @Deprecated("Deprecated in Java")
-    override fun onBackPressed() {
-        if (list.size > firstReqSize) {
-            //说明有新增的食材
-            saveDataRemindDialog()
-            return
-        }
-        val filterResult = list.firstOrNull { (it.useWeight ?: 0.toDouble()) > 0.toDouble() }
-        if (filterResult != null) {
-            //说明有称重的数据
-            saveDataRemindDialog()
-            return
-        }
-        super.onBackPressed()
+    override fun onResume() {
+        super.onResume()
+        pageVisible = true
+        showRecognizePage = false
+        cameraUtils.bind()
    }

-    private fun saveDataRemindDialog() {
-        val remindBinding = LayoutFoodRemindBinding.inflate(layoutInflater)
-        remindBinding.tvDialogTitle.text = "温馨提示"
-        remindBinding.tvDialogContent.text = "您好，当前页面存在尚未保存的数据，确认返回上页吗？"
-        CommonDialog(this).apply {
-            messageView = remindBinding.root
-            leftText = "取消"
-            rightText = "确认"
-            onLeftClick = { dismiss() }
-            onRightClick = {
-                dismiss()
+    override fun onPause() {
+        super.onPause()
+        pageVisible = false
+        cameraUtils.unbind()
+    }
+
+    /**
+     * 初始化相机并绑定预览容器
+     * @param container 相机预览容器
+     */
+    fun initCamera(container: ViewGroup) {
+        cameraUtils.initCamera()
+        val previewBinding = LayoutCameraPreviewBinding.inflate(layoutInflater, container)
+        cameraUtils.setPreviewController(previewBinding.previewView)
+    }
+
+    /**
+     * 注册返回键监听，替代已废弃的 onBackPressed()
+     */
+    private fun addBackKeyListener() {
+        onBackPressedDispatcher.addCallback(this) {
+            if (SpTool.cookMode == 1) {
+                // 采集模式：有新增食材时提示保存
+                if (list.isEmpty().not()) {
+                    saveDataRemindDialog()
+                    return@addCallback
+                }
+                if (pageFrom == HOME) {
+                    startActivity<SamplingListActivity>()
+                }
+            } else {
+                // 制作模式：有未保存数据时提示
+                val count = list.count { !it.isOriginalData }
+                if (count > 0) {
+                    saveDataRemindDialog()
+                    return@addCallback
+                }
+            }
            finish()
        }
-            onDismiss = { hideStatusBar() }
-        }.show()
+    }
+
+    /**
+     * 未保存数据提醒
+     */
+    private fun saveDataRemindDialog() {
+        CommonDialog(this)
+            .setTitle("温馨提示")
+            .setContent("您好，当前页面存在未保存的数据，确认返回吗？")
+            .setNegativeButton("取消")
+            .setPositiveButton("确认") {
+                if (SpTool.cookMode == 1 && pageFrom == HOME) {
+                    startActivity<SamplingListActivity>()
+                }
+                finish()
+            }
+            .setOnDismissCallback { hideStatusBar() }
+            .show()
+    }
+
+    /**
+     * 拍照成功回调
+     */
+    private val cameraSuccessCallback: (Uri) -> Unit = { uri ->
+        Log.d(TAG, "takePhoto success")
+        lastPhotoUri = uri
+        lifecycleScope.launch {
+            withContext(Dispatchers.IO) {
+                val bitmap = ImageUtil.uriToBitmap(this@PrepareCookActivity, uri)
+                if (bitmap == null) {
+                    Log.d(TAG, "takePhoto bitmap is null")
+                    isTakingPhoto.set(false)
+                    return@withContext
+                }
+                val foodScoreList = FoodModule.getFoodScoreList(bitmap)
+                if (foodScoreList.isEmpty()) {
+                    Log.d(TAG, "takePhoto foodScoreList is empty")
+                    isTakingPhoto.set(false)
+                    return@withContext
+                }
+                withContext(Dispatchers.Main) {
+                    queryFood(foodScoreList)
+                }
+            }
+        }
+    }
+
+    /**
+     * 拍照失败回调
+     */
+    private val cameraFailureCallback: (String) -> Unit = { errMsg ->
+        Log.d(TAG, "takePhoto failure")
+        isTakingPhoto.set(false)
+        toast(errMsg)
+    }
+
+    /**
+     * 调用接口查询识别到的菜品
+     * @param list 食材列表
+     */
+    private fun queryFood(list: List<FoodModule.IdNameScore>) {
+        Log.d(TAG, "takePhoto queryFood, list=${list.toString()}")
+        //调用接口成功，返回食材列表设置isTakingPhoto.set(false)，暂时写死数据
+        val foodList = mutableListOf<CookFoodGoodsEntity>()
+        list.forEachIndexed { index, food ->
+            var foodName = ""
+            var foodId = ""
+            food.name.split("WP").let {
+                foodName = it[0]
+                foodId = if (it.size > 1) {
+                    "WP${it[1]}"
+                } else {
+                    food.name
+                }
+            }
+            foodList.add(
+                CookFoodGoodsEntity(
+                    goodsId = foodId,
+                    goodsName = foodName,
+                    foodId = index.toString()
+                ).also {
+                    it.foodScore = ((1 - food.score) * 10000).toInt()
+                    it.isOriginalData = false
+                }
+            )
+        }
+        lastWeight = currentWeight
+        FoodRecognizeActivity.start(
+            activity = this,
+            imageUri = lastPhotoUri?.toString(),
+            currentWeight = currentWeight,
+            goodsList = ArrayList(foodList),
+            finishCallback = { isManualCancel, entity ->
+                Log.d(TAG, "queryFood: isManualCancel=$isManualCancel, entity=${entity.toJsonString()}")
+                manualCancelFlag = isManualCancel
+                if (isManualCancel) {
+                    return@start
+                }
+                entity?.let {
+                    foodSelectCallback(it)
+                }
+            }
+        )
+        showRecognizePage = true
+        isTakingPhoto.set(false)
+    }
+
+    /**
+     * 跳转食物搜索页（采集模式专用）
+     * @param v 触发搜索的 View，用于收起键盘
+     */
+    private fun jumpSearch(v: View) {
+        val intent = Intent(this, FoodSearchActivity::class.java).apply {
+            putExtra(FoodSearchActivity.FOOD_NAME, binding.etInputDish.text.toString().trim())
+        }
+        startActivity(intent) {
+            foodId = it?.getStringExtra(FoodSearchActivity.FOOD_ID)
+            val name = it?.getStringExtra(FoodSearchActivity.FOOD_NAME)
+            binding.etInputDish.run {
+                setText(name)
+                tag = name
+                setSelection(text.length)
+            }
+        }
+        KeyboardUtil.hideKeyboard(v)
    }

 }
@@ -3,10 +3,11 @@ package com.shuwei.dish.match.ui
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
-import android.view.MotionEvent
-import androidx.lifecycle.ViewModelProvider
+import androidx.activity.addCallback
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.shuwei.dish.match.R
@@ -15,24 +16,18 @@ import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.base.BaseApp
 import com.shuwei.dish.match.databinding.ActivitySamplingBinding
 import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding
-import com.shuwei.dish.match.db.AppRepository
-import com.shuwei.dish.match.dialog.DialogTool
+import com.shuwei.dish.match.dialog.CommonDialog
 import com.shuwei.dish.match.entity.CookFoodEntity
 import com.shuwei.dish.match.entity.FoodRecord
-import com.shuwei.dish.match.entity.FoodRecordBean
-import com.shuwei.dish.match.http.HttpUtil
-import com.shuwei.dish.match.http.UrlConfig
 import com.shuwei.dish.match.utils.DateTimeUtil
 import com.shuwei.dish.match.utils.SwipeCallback
 import com.shuwei.dish.match.utils.ext.gone
 import com.shuwei.dish.match.utils.ext.startActivity
-import com.shuwei.dish.match.utils.ext.toJsonString
-import com.shuwei.dish.match.utils.ext.toObject
 import com.shuwei.dish.match.utils.ext.toast
 import com.shuwei.dish.match.utils.ext.visible
-import com.shuwei.dish.match.viewmodel.AppViewModel
-import com.shuwei.dish.match.viewmodel.factory.AppFactory
 import java.io.Serializable
+import kotlinx.coroutines.launch
+import com.shuwei.dish.match.net.UiState

 class SamplingListActivity : BaseActivity() {

@@ -41,6 +36,7 @@ class SamplingListActivity : BaseActivity() {
    companion object {
        private const val TAG = "SamplingListActivity"
        const val IS_COOKING = "isCooking"
+        const val IS_CONFIG_PAGE = "isConfigPage"
    }

    override fun onCreate(savedInstanceState: Bundle?) {
@@ -49,10 +45,63 @@ class SamplingListActivity : BaseActivity() {
        setContentView(binding.root)
        setTitleBar()
        setHeaderBackground()
-        initViewModel()
        initRecyclerView()
        addViewListener()
+        initObserver()
        requestData(true)
+        onBackPressedDispatcher.addCallback(this) {  }
+    }
+
+    /**
+     * 收集 cookFoodListState，将本地烹饪中数据渲染到列表
+     */
+    private fun initObserver() {
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                appViewModel.cookFoodListState.collect { cookFoodEntities ->
+                    delayDismissLoading()
+                    if (cookFoodEntities.isNullOrEmpty()) {
+                        loadEmptyView()
+                        return@collect
+                    }
+                    val tempList = mutableListOf<FoodRecord>()
+                    cookFoodEntities.sortedByDescending { DateTimeUtil.convert(dateStr = it.createTime) }
+                        .forEach { entity ->
+                            tempList.add(FoodRecord().apply {
+                                foodId = entity.foodId
+                                foodName = entity.foodName
+                                cookMode = 1
+                                isCooking = true
+                            })
+                        }
+                    list.clear()
+                    list.addAll(tempList)
+                    dishAdapter.notifyDataSetChanged()
+                    binding.refreshLayout.run {
+                        setEnableRefresh(false)
+                        setEnableLoadMore(false)
+                    }
+                }
+            }
+        }
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                netViewModel.samplingListState.collect { state ->
+                    when (state) {
+                        is UiState.Loading -> showLoading()
+                        is UiState.Success -> loadDishList(state.data)
+                        is UiState.Error -> {
+                            binding.refreshLayout.setEnableRefresh(true)
+                            toast(state.msg)
+                            finishRefresh()
+                            delayDismissLoading()
+                            if (pageNo == 1) loadEmptyView()
+                        }
+                        is UiState.Idle -> {}
+                    }
+                }
+            }
+        }
    }


@@ -65,9 +114,7 @@ class SamplingListActivity : BaseActivity() {
            it.visible()
            it.setImageResource(R.drawable.ic_setting)
            it.setOnClickListener {
-                startActivity<DeviceConfigActivity> {
-                    putExtra(DeviceConfigActivity.COOK_MODE, 2)
-                }
+                startActivity<SettingActivity>()
            }
        }, backAction = {
            it.gone()
@@ -76,39 +123,30 @@ class SamplingListActivity : BaseActivity() {

    }

-    private lateinit var appViewModel: AppViewModel

-    private fun initViewModel() {
-        val db = BaseApp.instance!!.database
-        val factory =
-            AppFactory(AppRepository(db.appDao()))
-        appViewModel =
-            ViewModelProvider(this, factory)[AppViewModel::class.java]
-    }

-    fun getCookFoodList(action: (MutableList<CookFoodEntity>?) -> Unit) {
-        appViewModel.getCookFoodList(cookMode = 1) { action(it) }
+    fun getCookFoodList() {
+        appViewModel.getCookFoodList(cookMode = 1)
    }

    fun deleteCookFoodAndGoods(foodId: String, action: () -> Unit) {
-        appViewModel.deleteCookFoodAndGoods(cookMode = 1, foodId = foodId, onFinish = action)
+        lifecycleScope.launch {
+            appViewModel.deleteCookFoodAndGoods(cookMode = 1, foodId = foodId)
+            action()
+        }
    }

-    override fun onNewIntent(intent: Intent?) {
+    override fun onNewIntent(intent: Intent) {
        super.onNewIntent(intent)
+        val isConfigPage = intent?.getBooleanExtra(IS_CONFIG_PAGE, false) ?: false
+        if (isConfigPage) {
+            return
+        }
        val isCooking = intent?.getBooleanExtra(IS_COOKING, false) ?: false
        //toast("isCooking=$isCooking")
        refreshPage(isCooking)
    }

-    @Deprecated("Deprecated in Java")
-    @SuppressLint("GestureBackNavigation", "MissingSuperCall")
-    override fun onBackPressed() {
-        //super.onBackPressed()
-        //当前页面不允许返回
-        //dialog = toast("不允许返回操作")
-    }
-
    private var list: MutableList<FoodRecord> = mutableListOf()
    private val dishAdapter by lazy {
        SamplingAdapter(list = list).apply {
@@ -127,14 +165,13 @@ class SamplingListActivity : BaseActivity() {
            //烹饪中，跳到称熟重页面
            startActivity<SubmitFoodActivity> {
                putExtra(
-                    SubmitFoodActivity.FOOD_ITEM,
-                    item as Serializable
+                    SubmitFoodActivity.FOOD_ITEM, item as Serializable
                )
            }
            return
        }
-        startActivity<DishSamplingActivity> {
-            putExtra(DishSamplingActivity.FOOD_NAME, item.foodName)
+        startActivity<PrepareCookActivity> {
+            putExtra(PrepareCookActivity.FOOD_NAME, item.foodName)
        }
    }

@@ -167,7 +204,7 @@ class SamplingListActivity : BaseActivity() {
    private fun addViewListener() {
        binding.btnAddSampling.setOnClickListener {
            judgeDeviceConfig {
-                startActivity<DishSamplingActivity>()
+                startActivity<PrepareCookActivity>()
            }
        }
        binding.refreshLayout.setOnRefreshListener {
@@ -203,34 +240,13 @@ class SamplingListActivity : BaseActivity() {

    @SuppressLint("NotifyDataSetChanged")
    fun getSamplingList() {
-        showLoading()
-        val map = mapOf(
-//            "foodName" to input,
-            "pageNo" to "$pageNo",
-            "pageSize" to "$pageSize",
-            "canteenId" to BaseApp.canteenId
+        netViewModel.getSamplingList(
+            param = mutableMapOf(
+                "pageNum" to pageNo,
+                "pageSize" to pageSize,
+                "placeId" to BaseApp.canteenId
+            )
        )
-        val sb = StringBuilder(UrlConfig.SAMPLING_LIST).apply {
-            append("?")
-            map.forEach { (key, value) -> append("$key=$value&") }
-        }
-        sb.deleteCharAt(sb.length - 1)
-        HttpUtil.get(
-            url = sb.toString(),
-            doSuccess = {
-                loadDishList(it)
-            }, doFailure = { code, msg ->
-                binding.refreshLayout.run {
-                    setEnableRefresh(true)
-                }
-                toast(msg)
-                finishRefresh()
-                binding.refreshLayout.setEnableRefresh(true)
-                delayDismissLoading()
-                if (pageNo == 1) {
-                    loadEmptyView()
-                }
-            })
    }

    private fun finishRefresh() {
@@ -249,9 +265,7 @@ class SamplingListActivity : BaseActivity() {
        dishAdapter.notifyDataSetChanged()
        if (emptyViewBinding == null) {
            emptyViewBinding = LayoutEmptyViewBinding.inflate(
-                LayoutInflater.from(this),
-                binding.rvSamplingList,
-                false
+                LayoutInflater.from(this), binding.rvSamplingList, false
            )
        }
        emptyViewBinding!!.tvContent.text = "暂无数据"
@@ -293,65 +307,39 @@ class SamplingListActivity : BaseActivity() {
    @SuppressLint("NotifyDataSetChanged")
    fun refreshLocalData() {
        showLoading()
-        //查询本地数据
-        getCookFoodList { cookFoodEntities ->
-            delayDismissLoading()
-            if (cookFoodEntities.isNullOrEmpty()) {
-                loadEmptyView()
-                return@getCookFoodList
-            }
-            val tempList = mutableListOf<FoodRecord>()
-
-            cookFoodEntities
-                .sortedByDescending { DateTimeUtil.convert(dateStr = it.createTime) }
-                .forEach { entity ->
-                    tempList.add(FoodRecord().apply {
-                        foodId = entity.foodId
-                        foodName = entity.foodName
-                        cookMode = 1
-                        isCooking = true
-                    })
-                }
-            list.clear()
-            list.addAll(tempList)
-            dishAdapter.notifyDataSetChanged()
-            binding.refreshLayout.run {
-                setEnableRefresh(false)
-                setEnableLoadMore(false)
-            }
-        }
+        appViewModel.resetCookFoodList()
+        getCookFoodList()
    }

    private fun requestData(isCooking: Boolean) {
        if (isCooking) {
+            // 清除上次网络请求的残留状态
+            netViewModel.resetSamplingListState()
            refreshLocalData()
        } else {
+            // 同理，清除本地数据残留状态
+            appViewModel.resetCookFoodList()
            pageNo = 1
            getSamplingList()
        }
    }

    @SuppressLint("NotifyDataSetChanged")
-    private fun loadDishList(data: Any) {
-        binding.refreshLayout.run {
-            setEnableRefresh(true)
-        }
+    private fun loadDishList(records: MutableList<FoodRecord>?) {
+        binding.refreshLayout.setEnableRefresh(true)
        delayDismissLoading()
        finishRefresh()
-        val json = data.toJsonString()
-        val recordBean: FoodRecordBean? = json.toObject<FoodRecordBean>()
-        if (recordBean == null || recordBean.records.isNullOrEmpty()) {
+        if (records.isNullOrEmpty()) {
            //toast("暂未搜索到相关菜品信息")
            if (pageNo == 1) {
                loadEmptyView()
            }
            return
        }
-        val records = recordBean.records
        if (pageNo == 1) {
            list.clear()
        }
-        list.addAll(records!!)
+        list.addAll(records)
        dishAdapter.notifyDataSetChanged()
        val isLoadMoreEnable = records.size >= pageSize
        binding.refreshLayout.setEnableLoadMore(isLoadMoreEnable)
@@ -368,10 +356,11 @@ class SamplingListActivity : BaseActivity() {
            block()
            return
        }
-        appViewModel.loadSeasoning {
-            if (it.isEmpty()) {
+        lifecycleScope.launch {
+            val slots = appViewModel.loadSeasoningSlot()
+            if (slots.isEmpty()) {
                showDeviceConfigDialog()
-                return@loadSeasoning
+                return@launch
            }
            configFinished = true
            block()
@@ -379,19 +368,12 @@ class SamplingListActivity : BaseActivity() {
    }

    private fun showDeviceConfigDialog() {
-        DialogTool.load(
-            context = this,
-            title = "温馨提示",
-            content = "请先在设备配置页面进行调料设置",
-            leftBtnText = "取消",
-            rightBtnText = "去设置",
-            leftBtnClick = {},
-            rightBtnClick = {
-                startActivity<DeviceConfigActivity> {
-                    putExtra(DeviceConfigActivity.COOK_MODE, 2)
-                }
-            }
-        )
+        CommonDialog(this)
+            .setTitle("温馨提示")
+            .setContent("请先在设备配置页面进行调料设置")
+            .setNegativeButton("取消")
+            .setPositiveButton("去设置") { startActivity<SettingActivity>() }
+            .show()
    }

    private var isVisible = false
@@ -1,18 +1,15 @@
 package com.shuwei.dish.match.ui

-import android.annotation.SuppressLint
-import android.app.Dialog
 import android.content.Intent
 import android.os.Bundle
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModelProvider
+import androidx.activity.addCallback
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.launch
 import com.shuwei.dish.match.R
 import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.base.BaseApp
 import com.shuwei.dish.match.databinding.ActivitySelectDishBinding
-import com.shuwei.dish.match.db.AppRepository
-import com.shuwei.dish.match.dialog.DialogTool
-import com.shuwei.dish.match.entity.CookFoodEntity
+import com.shuwei.dish.match.dialog.CommonDialog
 import com.shuwei.dish.match.ui.fragment.DishListFragment
 import com.shuwei.dish.match.utils.KeyboardUtil
 import com.shuwei.dish.match.utils.ext.addOnActionSearchListener
@@ -20,20 +17,17 @@ import com.shuwei.dish.match.utils.ext.gone
 import com.shuwei.dish.match.utils.ext.startActivity
 import com.shuwei.dish.match.utils.ext.toast
 import com.shuwei.dish.match.utils.ext.visible
-import com.shuwei.dish.match.viewmodel.AppViewModel
-import com.shuwei.dish.match.viewmodel.factory.AppFactory

 class SelectDishActivity : BaseActivity() {

    companion object {
        const val IS_COOKING = "isCooking"
        const val DINNER_TYPE = "dinnerType"
+        const val IS_CONFIG_PAGE = "isConfigPage"
    }

    private lateinit var binding: ActivitySelectDishBinding

-    private lateinit var appViewModel: AppViewModel
-
    private var dinnerType: String = "1"

    private val fragmentList = mutableListOf<DishListFragment>().apply {
@@ -55,61 +49,46 @@ class SelectDishActivity : BaseActivity() {
            it.visible()
            it.setImageResource(R.drawable.ic_setting)
            it.setOnClickListener {
-                startActivity<DeviceConfigActivity> {
-                    putExtra(DeviceConfigActivity.COOK_MODE, 1)
-                }
+                startActivity<SettingActivity>()
            }
        }, backAction = {
            it.gone()
        })
-        initViewModel()
        addViewListener()
        loadFragment()
+        onBackPressedDispatcher.addCallback(this) {}
    }

-    private fun initViewModel() {
-        val db = BaseApp.instance!!.database
-        val factory =
-            AppFactory(AppRepository(db.appDao()))
-        appViewModel =
-            ViewModelProvider(this, factory)[AppViewModel::class.java]
-    }

-    fun getCookFoodList(action: (MutableList<CookFoodEntity>?) -> Unit) {
-        appViewModel.getCookFoodList(cookMode = 0, dinnerType = dinnerType) { action(it) }
+    fun getCookFoodList() {
+        appViewModel.getCookFoodList(cookMode = 0, dinnerType = dinnerType)
    }

    private var configFinished = false

    fun judgeDeviceConfig(block: () -> Unit) {
-        if (configFinished) {
+//        if (configFinished) {
+//            block()
+//            return
+//        }
+//        appViewModel.loadSeasoning {
+//            if (it.isEmpty()) {
+//                showDeviceConfigDialog()
+//                return@loadSeasoning
+//            }
+//            configFinished = true
+//            block()
+//        }
        block()
-            return
-        }
-        appViewModel.loadSeasoning {
-            if (it.isEmpty()) {
-                showDeviceConfigDialog()
-                return@loadSeasoning
-            }
-            configFinished = true
-            block()
-        }
    }

    private fun showDeviceConfigDialog() {
-        DialogTool.load(
-            context = this,
-            title = "温馨提示",
-            content = "请先在设备配置页面进行调料设置",
-            leftBtnText = "取消",
-            rightBtnText = "去设置",
-            leftBtnClick = {},
-            rightBtnClick = {
-                startActivity<DeviceConfigActivity> {
-                    putExtra(DeviceConfigActivity.COOK_MODE, 1)
-                }
-            }
-        )
+        CommonDialog(this)
+            .setTitle("温馨提示")
+            .setContent("请先在设备配置页面进行调料设置")
+            .setNegativeButton("取消")
+            .setPositiveButton("去设置") { startActivity<SettingActivity>() }
+            .show()
    }

    fun addViewListener() {
@@ -141,7 +120,7 @@ class SelectDishActivity : BaseActivity() {
            putExtra(FoodSearchActivity.DINNER_TYPE, dinnerType)
            putExtra(FoodSearchActivity.FOOD_NAME, searchText)
        }
-        KeyboardUtil.hideKeyboard(this, binding.etInputDish)
+        KeyboardUtil.hideKeyboard(binding.etInputDish)
    }

    private fun loadFragment() {
@@ -162,12 +141,19 @@ class SelectDishActivity : BaseActivity() {
    }

    fun deleteCookFoodAndGoods(foodId: String, action: () -> Unit) {
-        appViewModel.deleteCookFoodAndGoods(cookMode = 0, foodId = foodId, onFinish = action)
+        lifecycleScope.launch {
+            appViewModel.deleteCookFoodAndGoods(cookMode = 0, foodId = foodId)
+            action()
+        }
    }

-    override fun onNewIntent(intent: Intent?) {
+    override fun onNewIntent(intent: Intent) {
        super.onNewIntent(intent)
        runCatching {
+            val isConfigPage = intent?.getBooleanExtra(IS_CONFIG_PAGE, false) ?: false
+            if (isConfigPage) {
+                return
+            }
            val isCooking = intent?.getBooleanExtra(IS_COOKING, false) ?: false
            val lastDinnerType = intent?.getStringExtra(DINNER_TYPE) ?: "0"
            if (lastDinnerType == "1" || lastDinnerType == "2" || lastDinnerType == "3") {
@@ -183,14 +169,6 @@ class SelectDishActivity : BaseActivity() {
        }
    }

-    @Deprecated("Deprecated in Java")
-    @SuppressLint("GestureBackNavigation", "MissingSuperCall")
-    override fun onBackPressed() {
-        //super.onBackPressed()
-        //当前页面不允许返回
-//        dialog = toast("不允许返回操作")
-    }
-
    private var isVisible = false
    override fun onResume() {
        super.onResume()
@@ -202,4 +180,8 @@ class SelectDishActivity : BaseActivity() {
        isVisible = false
    }

+    public fun getFoodList(param: MutableMap<String, Any>) {
+        netViewModel.searchFoodList(param = param)
+    }
+
 }
@@ -0,0 +1,324 @@
+package com.shuwei.dish.match.ui
+
+import android.Manifest
+import android.annotation.SuppressLint
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.provider.Settings
+import androidx.core.content.ContextCompat
+import com.shuwei.dish.match.base.BaseActivity
+import com.shuwei.dish.match.databinding.ActivitySettingBinding
+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
+
+/**
+ * 设置Activity
+ * 功能：管理多个设置相关的Fragment，支持Fragment切换
+ */
+class SettingActivity : BaseActivity() {
+
+    companion object {
+        const val TAG = "SettingActivity"
+    }
+
+    private lateinit var binding: ActivitySettingBinding
+//    private val cameraUtils: CameraUtils by lazy {
+//        CameraUtils(this)
+//    }
+//    private lateinit var previewView: PreviewView
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivitySettingBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        setHeaderBackground()
+        setTitleBar(titleBarAction = {
+            it.visible()
+        }, titleAction = {
+            it.text = "设备设置"
+        }, rightIconActon = {
+            it.visible()
+            it.clickWithDebounce {
+                startActivity<MasterScaleActivity>()
+            }
+        })
+
+        initView()
+
+//        // 默认显示设备配置Fragment
+//        if (savedInstanceState == null) {
+//            showDeviceConfigFragment()
+//        }
+//
+//        initUI()
+    }
+
+
+    private fun initView() {
+        binding.tvCurrentMode.text = when (SpTool.cookMode) {
+            0 -> "当前：制作模式"
+            1 -> "当前：采样模式"
+            else -> "当前：未知模式"
+        }
+        binding.llCookMode.clickWithDebounce {
+            SingleFragmentActivity.start(this, SingleFragmentActivity.PageType.COOK_MODE)
+        }
+        binding.llSeasoningConfig.clickWithDebounce {
+            SingleFragmentActivity.start(this, SingleFragmentActivity.PageType.SEASONING_CONFIG)
+        }
+        binding.llFoodCollect.clickWithDebounce {
+            checkCameraPermission()
+        }
+    }
+
+    private fun openCollectPage() {
+        SingleFragmentActivity.start(this, SingleFragmentActivity.PageType.FOOD_COLLECT)
+    }
+
+    /**
+     * 检查相机权限并显示 CollectFragment
+     */
+    @SuppressLint("ObsoleteSdkInt")
+    private fun checkCameraPermission() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            // Android 6.0 以下，直接打开
+            openCollectPage()
+            return
+        }
+        if (ContextCompat.checkSelfPermission(
+                this,
+                Manifest.permission.CAMERA
+            ) == PackageManager.PERMISSION_GRANTED
+        ) {
+            // 权限已授予，直接打开
+            openCollectPage()
+        } else {
+            // 权限未授予，申请权限
+            requestPermission(Manifest.permission.CAMERA) { isGranted ->
+                if (isGranted) {
+                    // 权限已授予，直接打开
+                    openCollectPage()
+                } else {
+                    // 权限被拒绝
+                    showNotGrantedCameraPermissionDialog()
+                }
+            }
+        }
+    }
+
+    private fun showNotGrantedCameraPermissionDialog() {
+        CommonDialog(this)
+            .setTitle("温馨提示")
+            .setContent("暂无相机权限，无法使用菜品采集功能，请确认是否同意开始权限？")
+            .setNegativeButton("不同意")
+            .setPositiveButton("同意") {
+                val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
+                    data = Uri.fromParts("package", packageName, null)
+                }
+                startActivity(intent) {
+                    checkCameraPermission()
+                }
+            }
+            .show()
+    }
+
+//
+//    /**
+//     * 初始化UI和事件监听
+//     */
+//    private fun initUI() {
+//        // 设备配置按钮点击事件
+//        binding.btnDeviceConfig.setOnClickListener {
+//            showDeviceConfigFragment()
+//
+//            loadTabStyle(button = binding.btnDeviceConfig, isSelected = true)
+//            loadTabStyle(button = binding.btnSeasoningConfig, isSelected = false)
+//            loadTabStyle(button = binding.btnFoodCollect, isSelected = false)
+//        }
+//
+//        // 调料配置按钮点击事件
+//        binding.btnSeasoningConfig.setOnClickListener {
+//            showSeasoningConfigFragment()
+//
+//            loadTabStyle(button = binding.btnDeviceConfig, isSelected = false)
+//            loadTabStyle(button = binding.btnSeasoningConfig, isSelected = true)
+//            loadTabStyle(button = binding.btnFoodCollect, isSelected = false)
+//        }
+//
+//        // 菜品采集按钮点击事件
+//        binding.btnFoodCollect.setOnClickListener {
+//            checkCameraPermissionAndShowFragment()
+//
+//            loadTabStyle(button = binding.btnDeviceConfig, isSelected = false)
+//            loadTabStyle(button = binding.btnSeasoningConfig, isSelected = false)
+//            loadTabStyle(button = binding.btnFoodCollect, isSelected = true)
+//        }
+//
+//        // 主设备显示「秤数据监控」入口
+//        if (GlobalData.deviceRole == DeviceRole.MASTER) {
+//            binding.btnScaleMonitor.visible()
+//            binding.btnScaleMonitor.setOnClickListener {
+//                startActivity<MasterScaleActivity>()
+//            }
+//        }
+//
+//        // 初始化按钮颜色（默认设备配置为选中状态）
+//
+//        loadTabStyle(button = binding.btnDeviceConfig, isSelected = true)
+//        loadTabStyle(button = binding.btnSeasoningConfig, isSelected = false)
+//        loadTabStyle(button = binding.btnFoodCollect, isSelected = false)
+//    }
+//
+//    /**
+//     * 加载顶部Tab按钮样式
+//     *
+//     * @param button 按钮
+//     * @param isSelected 是否选中
+//     */
+//    private fun loadTabStyle(button: AppCompatButton, isSelected: Boolean) {
+//        button.apply {
+//            if (isSelected){
+//                // 选中
+//                setTextColor(Color.WHITE)
+//                textSize = 28f
+//                setTypeface(null, android.graphics.Typeface.BOLD)
+//                background = ContextCompat.getDrawable(this@SettingActivity, R.drawable.bg_btn_underline)
+//            } else {
+//                // 未选中
+//                setTextColor("#5E7585".toColorInt())
+//                textSize = 26f
+//                setTypeface(null, android.graphics.Typeface.NORMAL)
+//                background = null
+//            }
+//        }
+//    }
+//
+//    /**
+//     * 检查相机权限并显示 CollectFragment
+//     */
+//    @SuppressLint("ObsoleteSdkInt")
+//    private fun checkCameraPermissionAndShowFragment() {
+//        val collectFragment = fragmentList[2]
+//        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+//            // Android 6.0 以下，直接显示 Fragment
+//            showFragment(collectFragment)
+//            return
+//        }
+//        if (ContextCompat.checkSelfPermission(
+//                this,
+//                Manifest.permission.CAMERA
+//            ) == PackageManager.PERMISSION_GRANTED
+//        ) {
+//            // 权限已授予，直接显示 Fragment
+//            showFragment(collectFragment)
+//        } else {
+//            // 权限未授予，申请权限
+//            requestPermission(Manifest.permission.CAMERA) { isGranted ->
+//                if (isGranted) {
+//                    // 权限已授予，显示 CollectFragment
+//                    showFragment(collectFragment)
+//                } else {
+//                    // 权限被拒绝
+//                    toast("暂无相机权限，无法使用菜品采集功能")
+//                }
+//            }
+//        }
+//    }
+//
+//    /**
+//     * 初始化相机
+//     * @param container 相机预览容器
+//     */
+//    fun initCamera(container: ViewGroup) {
+//        cameraUtils.initCamera()
+//        val previewBinding =
+//            LayoutCameraPreviewBinding.inflate(layoutInflater, container)
+//        previewView = previewBinding.previewView.also {
+//            it.updateLayoutParams {
+//                width = 456.dp
+//                height = 342.dp
+//            }
+//        }
+//        cameraUtils.setPreviewController(previewView)
+//    }
+//
+//    /**
+//     * Activity 恢复时绑定相机
+//     */
+//    override fun onResume() {
+//        super.onResume()
+//        cameraUtils.bind()
+//    }
+//
+//    /**
+//     * Activity 暂停时解绑相机
+//     */
+//    override fun onPause() {
+//        super.onPause()
+//        cameraUtils.unbind()
+//    }
+//
+//    /**
+//     * 提供给 Fragment 调用的拍照方法
+//     */
+//    fun takePhoto(succCallback: (Uri) -> Unit, failCallback: (msg: String) -> Unit = {}) {
+//        cameraUtils.takePhoto(succCallback = succCallback, failCallback = failCallback)
+//    }
+//
+//    /**
+//     * 显示设备切换Fragment
+//     */
+//    private fun showDeviceConfigFragment() {
+//        showFragment(fragmentList[0])
+//    }
+//
+//    /**
+//     * 显示设调料配置Fragment
+//     */
+//    private fun showSeasoningConfigFragment() {
+//        showFragment(fragmentList[1])
+//    }
+//
+//    private val fragmentList = mutableListOf<Fragment>().apply {
+//        add(DeviceConfigFragment())
+//        add(SeasoningConfigFragment())
+//        add(CollectFragment())
+//    }
+//
+//    /**
+//     * 显示指定的 Fragment
+//     * 使用 add/show/hide 方式管理 Fragment，避免重复创建
+//     * 已添加的 Fragment 直接显示，未添加的 Fragment 先添加再显示
+//     */
+//    private fun showFragment(fragment: Fragment) {
+//        runCatching {
+//            supportFragmentManager.beginTransaction().apply {
+//                // 如果 Fragment 还未添加到容器中，则添加
+//                if (!fragment.isAdded) {
+//                    add(binding.fragmentContainer.id, fragment)
+//                } else {
+//                    // 已添加过，直接显示
+//                    show(fragment)
+//                }
+//
+//                // 隐藏其他 Fragment
+//                fragmentList.forEach { otherFragment ->
+//                    if (otherFragment != fragment && otherFragment.isAdded) {
+//                        hide(otherFragment)
+//                    }
+//                }
+//
+//                commit()
+//            }
+//        }.onFailure {
+//            it.printStackTrace()
+//        }
+//    }
+}
@@ -0,0 +1,121 @@
+package com.shuwei.dish.match.ui
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import com.shuwei.dish.match.base.BaseActivity
+import com.shuwei.dish.match.base.BaseApp
+import com.shuwei.dish.match.ui.fragment.CollectFragment
+import com.shuwei.dish.match.ui.fragment.DeviceConfigFragment
+import com.shuwei.dish.match.ui.fragment.SeasoningConfigFragment
+import com.shuwei.dish.match.utils.ext.gone
+import com.shuwei.dish.match.utils.ext.visible
+
+/**
+ * 通用单 Fragment 容器 Activity
+ * 通过 [PageType] 决定加载哪个 Fragment，避免为每个配置/功能页面单独创建 Activity
+ */
+class SingleFragmentActivity : BaseActivity() {
+
+    interface LifecycleCallback {
+        fun onActivityResume()
+        fun onActivityPause()
+    }
+
+    /**
+     * 支持的页面类型枚举
+     * 新增页面时在此追加枚举值，并在 [createFragment] 中补充对应分支
+     */
+    enum class PageType {
+        /** 菜品采集页 */
+        FOOD_COLLECT,
+
+        /** 设备配置页 */
+        COOK_MODE,
+
+        /** 调料配置页 */
+        SEASONING_CONFIG,
+    }
+
+    companion object {
+        private const val EXTRA_PAGE_TYPE = "extra_page_type"
+
+        /**
+         * 启动 SingleFragmentActivity
+         * @param context 调用方 Context
+         * @param pageType 要显示的页面类型
+         */
+        fun start(context: Context, pageType: PageType) {
+            Intent(context, SingleFragmentActivity::class.java).apply {
+                putExtra(EXTRA_PAGE_TYPE, pageType.name)
+                context.startActivity(this)
+            }
+        }
+    }
+
+    private var lifecycleCallback: LifecycleCallback? = null
+    fun setLifecycleCallback(callback: LifecycleCallback) {
+        lifecycleCallback = callback
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setHeaderBackground()
+
+        // 解析页面类型，非法值直接关闭
+        val typeName = intent.getStringExtra(EXTRA_PAGE_TYPE)
+        val pageType = typeName?.let {
+            runCatching { PageType.valueOf(it) }.getOrNull()
+        }
+        if (pageType == null) {
+            finish()
+            return
+        }
+
+        // 配置标题栏
+        setTitleBar(
+            titleBarAction = { it.visible() },
+            titleAction = { it.text = getTitleForPage(pageType) },
+            rightIconActon = { it.gone() }
+        )
+
+        // 首次创建时加载 Fragment，避免屏幕旋转重复添加
+        if (savedInstanceState == null) {
+            val fragment = createFragment(pageType)
+            supportFragmentManager.beginTransaction()
+                .replace(getFragmentContainerId(), fragment)
+                .commit()
+        }
+    }
+
+    /**
+     * 根据页面类型返回对应标题文本
+     */
+    private fun getTitleForPage(pageType: PageType): String = when (pageType) {
+        PageType.FOOD_COLLECT -> "食材采样"
+        PageType.COOK_MODE -> "餐品模式"
+        PageType.SEASONING_CONFIG -> "调料区设置"
+    }
+
+    /**
+     * 根据页面类型创建对应 Fragment 实例
+     */
+    private fun createFragment(pageType: PageType): Fragment = when (pageType) {
+        PageType.FOOD_COLLECT -> CollectFragment()
+        PageType.COOK_MODE -> DeviceConfigFragment()
+        PageType.SEASONING_CONFIG -> SeasoningConfigFragment()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        lifecycleCallback?.onActivityResume()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        lifecycleCallback?.onActivityPause()
+    }
+
+}
@@ -0,0 +1,353 @@
+package com.shuwei.dish.match.ui
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import androidx.core.view.updateLayoutParams
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import android.widget.LinearLayout
+import androidx.activity.addCallback
+import androidx.lifecycle.lifecycleScope
+import com.google.android.flexbox.AlignItems
+import com.google.android.flexbox.FlexDirection
+import com.google.android.flexbox.FlexWrap
+import com.google.android.flexbox.FlexboxLayoutManager
+import com.shuwei.dish.match.adapter.Seasoning18GridAdapter
+import com.shuwei.dish.match.adapter.Seasoning22GridAdapter
+import com.shuwei.dish.match.adapter.ScaleRowAdapter
+import com.shuwei.dish.match.base.BaseActivity
+import com.shuwei.dish.match.base.BaseApp
+import com.shuwei.dish.match.base.GlobalData
+import com.shuwei.dish.match.databinding.ActivitySlaveBinding
+import com.shuwei.dish.match.dialog.CommonDialog
+import com.shuwei.dish.match.entity.SeasoningSlotEntity
+import com.shuwei.dish.match.scale.ScaleData
+import com.shuwei.dish.match.scale.ScaleDeviceConfig
+import com.shuwei.dish.match.scale.ScaleServiceManager
+import com.shuwei.dish.match.utils.NetworkUtil
+import com.shuwei.dish.match.utils.SizeTool
+import com.shuwei.dish.match.utils.WeightUtil
+import com.shuwei.dish.match.utils.ext.dp
+import kotlinx.coroutines.launch
+
+/**
+ * 子设备专属页面（小屏幕设备使用）
+ * 仅展示本机秤的实时数据和主设备连接状态
+ * 22个秤和18个秤使用与 MasterScaleActivity 相同的网格布局，其余使用线性列表
+ */
+class SlaveActivity : BaseActivity() {
+
+    private lateinit var binding: ActivitySlaveBinding
+
+    /** 本机秤数据列表：线性列表模式使用 */
+    private val linearAdapter = ScaleRowAdapter()
+
+    /** 22个秤网格 adapter */
+    private var scale22Adapter: Seasoning22GridAdapter? = null
+    /** 18个秤网格 adapter */
+    private var scale18Adapter: Seasoning18GridAdapter? = null
+
+    /** 已连接的主设备数量（有连接即代表主设备在线） */
+    private var masterConnected = false
+
+    /** 各秤地址的上一次重量快照，用于计算 delta */
+    private val weightSnapshot = mutableMapOf<Int, Double>()
+    /** key = address，value = 调料名称，用于注入 ScaleData.name，避免重量更新时覆盖名称 */
+    private val slotNameMap = mutableMapOf<Int, String>()
+    /** 主线程 Handler，用于延迟清除高亮 */
+    private val mainHandler = Handler(Looper.getMainLooper())
+    /** 当前高亮清除任务，新高亮触发时取消旧任务 */
+    private var clearHighlightRunnable: Runnable? = null
+    private val size by lazy { SizeTool.getFlexLayoutSize(10.dp) }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivitySlaveBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        setHeaderBackground()
+
+        binding.tvDeviceId.text = "设备：${GlobalData.deviceId}"
+        binding.tvDeviceIp.text = "IP：${getLocalIpAddress()}"
+
+        setupScaleList()
+        updateMasterStatus(ScaleServiceManager.isMasterConnected)
+        loadSlotsFromDb()
+        listenLocalScales()
+        listenMasterConnection()
+        listenSeasoningConfig()
+        addBackKeyListener()
+    }
+
+    /**
+     * 根据 deviceId 选择对应的布局方式：
+     * - 22个秤：FlexboxLayoutManager + Scale22GridAdapter
+     * - 18个秤：GridLayoutManager(6列) + Scale18GridAdapter
+     * - 其他：LinearLayoutManager + 线性列表
+     */
+    private fun setupScaleList() {
+        binding.rvScaleList.itemAnimator = null
+        when (GlobalData.deviceId) {
+            ScaleDeviceConfig.DEVICE_ID_22 -> {
+                binding.rvScaleList.updateLayoutParams<LinearLayout.LayoutParams> {
+                    height = size.rvHeight
+                    weight = 0f
+                    topMargin = 20.dp
+                }
+                binding.rvScaleList.layoutManager = FlexboxLayoutManager(this).apply {
+                    flexDirection = FlexDirection.COLUMN
+                    flexWrap = FlexWrap.WRAP
+                    alignItems = AlignItems.FLEX_START
+                }
+                scale22Adapter = Seasoning22GridAdapter(
+                    size.largeSize,
+                    size.smallSize,
+                    showNameOnly = false
+                ).also {
+                    it.onItemClick = { scale, _ -> showTareDialog(scale.address) }
+                }
+                binding.rvScaleList.adapter = scale22Adapter
+            }
+            ScaleDeviceConfig.DEVICE_ID_18 -> {
+                binding.rvScaleList.updateLayoutParams<LinearLayout.LayoutParams> { topMargin = 0 }
+                binding.rvScaleList.layoutManager = GridLayoutManager(this, 6).apply {
+                    spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
+                        override fun getSpanSize(position: Int) = 1
+                    }
+                }
+                scale18Adapter = Seasoning18GridAdapter(showNameOnly = false).also {
+                    it.onItemClick = { scale, _ -> showTareDialog(scale.address) }
+                }
+                binding.rvScaleList.adapter = scale18Adapter
+            }
+            else -> {
+                binding.rvScaleList.updateLayoutParams<LinearLayout.LayoutParams> { topMargin = 20.dp }
+                binding.rvScaleList.layoutManager = LinearLayoutManager(this)
+                linearAdapter.setOnItemClickListener { _, _, position ->
+                    val item = linearAdapter.items.getOrNull(position) ?: return@setOnItemClickListener
+                    showTareDialog(item.address)
+                }
+                binding.rvScaleList.adapter = linearAdapter
+            }
+        }
+    }
+
+    /**
+     * 禁用返回键，防止退回 InitActivity 后重复打开本页
+     */
+    private fun addBackKeyListener() {
+        onBackPressedDispatcher.addCallback(this) { }
+    }
+
+    /**
+     * 订阅主设备连接状态，回调在非主线程，切换到主线程更新 UI
+     */
+    private fun listenMasterConnection() {
+        ScaleServiceManager.onMasterConnectionChanged = { connected ->
+            runOnUiThread { updateMasterStatus(connected) }
+        }
+    }
+
+    /**
+     * 从本地 Room 加载本机设备的槽位配置并更新 adapter
+     * 主设备未开机时也能正常展示上次配置
+     */
+    private fun loadSlotsFromDb() {
+        lifecycleScope.launch {
+            val slots = appViewModel.getSeasoningSlotsByDeviceId(GlobalData.deviceId)
+            applySlots(slots)
+        }
+    }
+
+    /**
+     * 监听主设备下发的调料配置同步事件
+     * 收到后以全量替换方式更新本机 DB（先删后插），再刷新 UI
+     */
+    private fun listenSeasoningConfig() {
+        ScaleServiceManager.onSeasoningConfig = onSeasoningConfig@{ event ->
+            val mySlots = event.slots
+                ?.filter { it.deviceId == GlobalData.deviceId }
+                ?.map { SeasoningSlotEntity(it.deviceId, it.address, it.goodsId, it.goodsName) }
+                ?: return@onSeasoningConfig
+            lifecycleScope.launch {
+                // 全量替换：先删除本机所有旧槽位，再写入最新配置
+                appViewModel.deleteAllSlotsByDeviceId(GlobalData.deviceId)
+                appViewModel.upsertAllSeasoningSlots(mySlots)
+                applySlots(mySlots)
+            }
+        }
+    }
+
+    /**
+     * 将槽位配置应用到对应 adapter（按地址匹配格子位置）
+     * 同时以传入列表为准全量刷新 slotNameMap：
+     *   - 新列表中存在的地址：更新名称
+     *   - 新列表中不存在的地址：从 slotNameMap 移除，并清空对应格子名称
+     */
+    private fun applySlots(slots: List<SeasoningSlotEntity>) {
+        val newAddresses = slots.map { it.address }.toSet()
+
+        // 清除已被删除的槽位：从 slotNameMap 移除并清空 adapter 对应格子
+        val removedAddresses = slotNameMap.keys.filter { it !in newAddresses }
+        removedAddresses.forEach { addr ->
+            slotNameMap.remove(addr)
+            when {
+                scale22Adapter != null -> {
+                    val pos = ScaleDeviceConfig.SCALE_ORDER_22.indexOf(addr)
+                    if (pos >= 0) scale22Adapter!!.updateItemName(pos, "")
+                }
+                scale18Adapter != null -> {
+                    val pos = ScaleDeviceConfig.SCALE_ORDER_18.indexOf(addr)
+                    if (pos >= 0) scale18Adapter!!.updateItemName(pos, "")
+                }
+                else -> {
+                    val list = linearAdapter.items.toMutableList()
+                    val idx = list.indexOfFirst { it.address == addr }
+                    if (idx >= 0) {
+                        list[idx] = list[idx].copy(name = "")
+                        linearAdapter.submitList(list)
+                    }
+                }
+            }
+        }
+
+        // 更新新列表中存在的槽位
+        slots.forEach { slot ->
+            slotNameMap[slot.address] = slot.goodsName
+            when {
+                scale22Adapter != null -> {
+                    val pos = ScaleDeviceConfig.SCALE_ORDER_22.indexOf(slot.address)
+                    if (pos >= 0) scale22Adapter!!.updateItemName(pos, slot.goodsName)
+                }
+                scale18Adapter != null -> {
+                    val pos = ScaleDeviceConfig.SCALE_ORDER_18.indexOf(slot.address)
+                    if (pos >= 0) scale18Adapter!!.updateItemName(pos, slot.goodsName)
+                }
+                else -> {
+                    val list = linearAdapter.items.toMutableList()
+                    val idx = list.indexOfFirst { it.address == slot.address }
+                    if (idx >= 0) {
+                        list[idx] = list[idx].copy(name = slot.goodsName)
+                        linearAdapter.submitList(list)
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 监听本机 WeightUtil 回调，实时刷新秤列表
+     * 22/18个秤走网格 adapter，其余走线性列表
+     * 秤稳定且重量增加超过阈值时，高亮对应格子，15秒后自动恢复
+     */
+    private fun listenLocalScales() {
+        WeightUtil.addWeightListener(TAG) { address, state, weight ->
+            // 重量快照与高亮判断（在回调线程计算，不涉及 UI）
+            val baseline = weightSnapshot[address]
+            val shouldHighlight = baseline != null
+                    && state == WeightUtil.STATE_STABLE
+                    && (weight - baseline) > WEIGHT_DELTA_THRESHOLD
+            if (baseline == null || state == WeightUtil.STATE_STABLE) {
+                weightSnapshot[address] = weight
+            }
+
+            runOnUiThread {
+                when {
+                    scale22Adapter != null -> {
+                        // 用最新数据更新缓存后整体刷新网格
+                        val existing = scale22Adapter!!.items.toMutableList()
+                        val idx = existing.indexOfFirst { it.address == address }
+                        val newData = ScaleData(GlobalData.deviceId, address, weight, state, System.currentTimeMillis(), name = slotNameMap[address])
+                        if (idx >= 0) existing[idx] = newData else existing.add(newData)
+                        scale22Adapter!!.updateByAddress(existing)
+                    }
+                    scale18Adapter != null -> {
+                        val existing = scale18Adapter!!.items.toMutableList()
+                        val idx = existing.indexOfFirst { it.address == address }
+                        val newData = ScaleData(GlobalData.deviceId, address, weight, state, System.currentTimeMillis(), name = slotNameMap[address])
+                        if (idx >= 0) existing[idx] = newData else existing.add(newData)
+                        scale18Adapter!!.updateByAddress(existing)
+                    }
+                    else -> {
+                        val item = ScaleRowAdapter.ScaleItem(address, weight, state, slotNameMap[address] ?: "")
+                        val list = linearAdapter.items.toMutableList()
+                        val idx = list.indexOfFirst { it.address == address }
+                        if (idx >= 0) {
+                            list[idx] = item
+                        } else {
+                            list.add(item)
+                            list.sortBy { it.address }
+                        }
+                        linearAdapter.submitList(list)
+                    }
+                }
+
+                // 触发格子高亮
+                if (shouldHighlight) {
+                    clearHighlightRunnable?.let { mainHandler.removeCallbacks(it) }
+                    val pos22 = ScaleDeviceConfig.SCALE_ORDER_22.indexOf(address)
+                    val pos18 = ScaleDeviceConfig.SCALE_ORDER_18.indexOf(address)
+                    scale22Adapter?.highlightPosition(pos22)
+                    scale18Adapter?.highlightPosition(pos18)
+                    clearHighlightRunnable = Runnable {
+                        scale22Adapter?.clearHighlight()
+                        scale18Adapter?.clearHighlight()
+                    }.also { mainHandler.postDelayed(it, HIGHLIGHT_DURATION_MS) }
+                }
+            }
+        }
+    }
+
+    /**
+     * 更新主设备连接状态文字
+     */
+    @SuppressLint("SetTextI18n")
+    fun updateMasterStatus(connected: Boolean) {
+        masterConnected = connected
+        binding.tvMasterStatus.text = if (connected) "主设备：已连接 ✓" else "主设备：未连接"
+        binding.tvMasterStatus.setTextColor(
+            getColor(if (connected) android.R.color.holo_green_dark else android.R.color.holo_red_light)
+        )
+    }
+
+    override fun onDestroy() {
+        ScaleServiceManager.onMasterConnectionChanged = null
+        ScaleServiceManager.onSeasoningConfig = null
+        WeightUtil.removeWeightListener(TAG)
+        clearHighlightRunnable?.let { mainHandler.removeCallbacks(it) }
+        super.onDestroy()
+    }
+
+    companion object {
+        const val TAG = "SlaveActivity"
+        /** 重量增加阈值（克），超过此值才触发高亮 */
+        private const val WEIGHT_DELTA_THRESHOLD = 10.0
+        /** 高亮自动恢复时间（毫秒） */
+        private const val HIGHLIGHT_DURATION_MS = 5_000L
+    }
+
+    /**
+     * 弹出清零确认对话框
+     * @param address 目标秤地址
+     */
+    private fun showTareDialog(address: Int) {
+        CommonDialog(this)
+            .setTitle("清零确认")
+            .setContent("确认对秤 $address 执行清零操作？")
+            .setNegativeButton("取消")
+            .setPositiveButton("确认") {
+                WeightUtil.tareTwo(address)
+            }
+            .show()
+    }
+
+    /**
+     * 获取本机局域网 IP，委托给 NetworkUtil 统一处理版本兼容
+     */
+    private fun getLocalIpAddress(): String {
+        return NetworkUtil.getLocalIpAddress(this).ifEmpty { "未知" }
+    }
+
+}
+
@@ -1,46 +1,54 @@
 package com.shuwei.dish.match.ui

 import android.annotation.SuppressLint
+import android.graphics.Color
+import android.graphics.Typeface
 import android.os.Bundle
+import android.text.style.ForegroundColorSpan
+import android.text.style.StyleSpan
 import android.util.Log
-import android.util.SparseArray
-import android.util.SparseIntArray
-import android.widget.FrameLayout
-import android.widget.TextView
-import androidx.core.util.forEach
-import androidx.lifecycle.ViewModelProvider
+import androidx.activity.addCallback
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.GridLayoutManager
 import com.google.gson.reflect.TypeToken
 import com.shuwei.dish.match.R
-import com.shuwei.dish.match.adapter.TextCellAdapter
+import com.shuwei.dish.match.adapter.SeasoningWeightAdapter
 import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.base.BaseApp
 import com.shuwei.dish.match.databinding.ActivitySubmitFoodBinding
-import com.shuwei.dish.match.db.AppRepository
-
+import com.shuwei.dish.match.dialog.CommonDialog
 import com.shuwei.dish.match.entity.CookFoodEntity
 import com.shuwei.dish.match.entity.CookFoodGoodsEntity
 import com.shuwei.dish.match.entity.FoodRecord
-import com.shuwei.dish.match.entity.SeasoningEntity
-import com.shuwei.dish.match.http.HttpUtil
-import com.shuwei.dish.match.http.UrlConfig
+import com.shuwei.dish.match.net.NetViewModel
+import com.shuwei.dish.match.net.UiState
+import com.shuwei.dish.match.scale.ScaleDeviceConfig
+import com.shuwei.dish.match.scale.ScaleServiceManager
 import com.shuwei.dish.match.utils.AddressUtil
 import com.shuwei.dish.match.utils.WeightUtil
+import com.shuwei.dish.match.utils.ext.appendText
+import com.shuwei.dish.match.utils.ext.buildSpannableString
 import com.shuwei.dish.match.utils.ext.clickWithDebounce
 import com.shuwei.dish.match.utils.ext.gone
+import com.shuwei.dish.match.utils.ext.roundedDecimalPlace
 import com.shuwei.dish.match.utils.ext.roundedOneDecimalPlace
 import com.shuwei.dish.match.utils.ext.startActivity
 import com.shuwei.dish.match.utils.ext.toJsonString
 import com.shuwei.dish.match.utils.ext.toType
 import com.shuwei.dish.match.utils.ext.toast
 import com.shuwei.dish.match.utils.ext.visible
-import com.shuwei.dish.match.viewmodel.AppViewModel
-import com.shuwei.dish.match.viewmodel.factory.AppFactory
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext

@SuppressLint("UseSparseArrays")
 class SubmitFoodActivity : BaseActivity() {

    companion object {
-        const val TAG = "SubmitDishActivity"
+        const val TAG = "SubmitFoodActivity"
        const val FOOD_ITEM = "foodItem"
        const val GOODS_LIST = "goodsList"
    }
@@ -50,8 +58,6 @@ class SubmitFoodActivity : BaseActivity() {
    private var food: FoodRecord? = null
    private var goodsList: MutableList<CookFoodGoodsEntity>? = null

-    private var isCooking = false
-
    private val cookFoodEntity by lazy {
        CookFoodEntity().apply {
            food?.let {
@@ -64,23 +70,46 @@ class SubmitFoodActivity : BaseActivity() {
        }
    }

+    /** 调料列表 adapter */
+    private val seasoningAdapter = SeasoningWeightAdapter()
+
+    /**
+     * 各秤的初始重量快照，key = "deviceId#address"
+     * 首次收到稳定数据时记录，之后用于计算用量差值
+     */
+    private val baselineMap = mutableMapOf<String, Double>()
+
+    /**
+     * 槽位配置：key = "deviceId#address"，value = goodsId to goodsName
+     * 从 Room dm_seasoning_slot 加载
+     */
+    private val slotMap = mutableMapOf<String, Pair<String, String>>()
+
+    /**
+     * 各秤原始用量，key = "deviceId#address"，value = Triple(goodsId, goodsName, useWeight)
+     * 每次秤数据变化后更新，再按 goodsName 聚合推给 adapter
+     */
+    private val rawWeightMap = mutableMapOf<String, Triple<String, String, Double>>()
+
+    /**
+     * isCooking=true 时从 goodsList 预填充的历史用量，key = goodsName，value = goodsId to useWeight
+     * 用于 refreshAdapterByName 时叠加到秤新增用量上
+     */
+    private val baseSeasoningMap = mutableMapOf<String, Pair<String, Double>>()
+
    @Suppress("unchecked_cast", "DEPRECATION")
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        binding = ActivitySubmitFoodBinding.inflate(layoutInflater)
        setContentView(binding.root)
-        initViewModel()
        setHeaderBackground()
        intent.extras?.apply {
            food = getSerializable(FOOD_ITEM) as FoodRecord?
            Log.d(TAG, "onCreate: cookMode=${food?.cookMode}")
-            isCooking = food?.isCooking ?: false
-            if (isCooking) {
-                //烹饪中，从本地查询数据
-                loadSeasoningFromLocal()
-            } else {
-                //非烹饪中，从菜品主辅材配置页面带入数据
+            // isCooking=false：从前一页面带入主辅材数据；isCooking=true：从数据库查询
+            if (food?.isCooking == false) {
                goodsList = getSerializable(GOODS_LIST) as MutableList<CookFoodGoodsEntity>?
+                Log.d(TAG, "onCreate: goodsList=${goodsList.toJsonString()}")
            }
        }
        setTitleBar(titleBarAction = {
@@ -89,192 +118,204 @@ class SubmitFoodActivity : BaseActivity() {
            it.text = food?.foodName
        }, rightIconActon = {
            it.gone()
-            it.setImageResource(R.drawable.ic_setting)
+        }, backAction = {
            it.setOnClickListener {
-                //startActivity<DeviceSettingActivity>()
+                remindSaveDataDialog()
            }
        })
+        setupRecyclerView()
        addViewListener()
-    }
-
-    private fun loadSeasoningFromLocal() {
-        appViewModel.getCookFoodGoodsList(foodId = food!!.foodId!!, cookMode = food!!.cookMode) { it ->
-            goodsList = mutableListOf()
-            val goodsIdList = mutableListOf<String>()
-            //设置主辅材数据
-            val tempList = it.filter { goods -> goods.materialType != 3 }
-            tempList.forEach {
-                if (!goodsIdList.contains(it.goodsId)) {
-                    goodsList?.add(it)
-                    goodsIdList.add(it.goodsId)
+        initObserver()
+        loadSlotsThenObserveScales()
+        onBackPressedDispatcher.addCallback(this) {
+            remindSaveDataDialog()
        }
    }

-            //获取调料数据并展示
-            val filterList: List<SeasoningEntity>? = it.filter { goods -> goods.materialType == 3 }
-                .map { entity ->
-                    SeasoningEntity().also { se ->
-                        se.goodsId = entity.goodsId
-                        se.goodsName = entity.goodsName
-                        se.goodsOrRelationCode = entity.goodsOrRelationCode
-                        se.relateionType = entity.relateionType
-                        se.materialType = entity.materialType
-                        se.allEdible = entity.allEdible
-                        se.useWeight = entity.useWeight
-                        se.popularName = entity.popularName
-                        se.canteenId = entity.canteenId
-                        se.relateionType_dictText = entity.relateionType_dictText
-                        se.foodId = entity.foodId
-                        se.sort = entity.sort
-                        se.pageType = 0
+    /**
+     * 收集 submitCookFoodState，处理提交成功/失败
+     */
+    private fun initObserver() {
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                netViewModel.submitCookFoodState.collect { state ->
+                    when (state) {
+                        is UiState.Success -> submitSuccess(food?.cookMode == 1)
+                        is UiState.Error -> {
+                            toast(state.msg)
+                            dismissLoading()
+                        }
+
+                        else -> {}
                    }
                }
-            filterList?.toMutableList()?.let { cellData ->
-                loadTextCell(cellData)
            }
        }
    }

-
-//    private lateinit var seasoningList: List<SeasoningEntity>
-//    private var isFirstSave = true
-//    fun updateSeasoningList(list: MutableList<SeasoningEntity>) {
-//        if (isFirstSave) {
-//            val json = list.toJsonString()
-//            val typeToken = object : TypeToken<List<SeasoningEntity>>() {}
-//            seasoningList = json.toType(typeToken = typeToken)
-//            isFirstSave = false
-//        }
-//    }
-
-    private val seasoningArray by lazy {
-        SparseArray<Double>()
+    /** 初始化 RecyclerView，2列 GridLayoutManager */
+    private fun setupRecyclerView() {
+        binding.rvSeasoning.itemAnimator = null
+        binding.rvSeasoning.layoutManager = GridLayoutManager(this, 2)
+        binding.rvSeasoning.adapter = seasoningAdapter
    }

+    /**
+     * 从 Room 加载槽位配置后，开始订阅子设备秤数据
+     * isCooking=true 时先从数据库查询 goodsList，筛选调料预填充 adapter，再开始观测
+     */
+    private fun loadSlotsThenObserveScales() {
+        lifecycleScope.launch {
+            val slots = appViewModel.loadSeasoningSlot()
+            slots.forEach { slot ->
+                slotMap["${slot.deviceId}#${slot.address}"] = slot.goodsId to slot.goodsName
+            }
+            if (food?.isCooking == true) {
+                // 制作中：从数据库查询 goodsList，筛选调料数据预填充 adapter
+                val foodId = food?.foodId ?: return@launch
+                val cookMode = food?.cookMode ?: return@launch
+                val list = appViewModel.getCookFoodGoodsList(foodId, cookMode)
+                goodsList = list
+                list.filter { it.materialType == 3 }.forEach { item ->
+                    val name = item.goodsName ?: ""
+                    val weight = item.useWeight ?: 0.0
+                    baseSeasoningMap[name] = (item.goodsId) to weight
+                    seasoningAdapter.updateItem(
+                        SeasoningWeightAdapter.Item(
+                            goodsId = item.goodsId,
+                            goodsName = name,
+                            useWeight = weight
+                        )
+                    )
+                }
+                observeScaleData()
+            } else {
+                observeScaleData()
+            }
+        }
+    }

-    private val firstGoodsArray = SparseArray<Double>()
+    /**
+     * 订阅 ScaleServiceManager.allScales，过滤子设备数据并更新 adapter
+     * 排除主设备（DEVICE_ID_2），只处理 22格、18格、1格子设备
+     */
+    private fun observeScaleData() {
+        val flow = ScaleServiceManager.allScales ?: return
+        lifecycleScope.launch {
+            flow.collectLatest { scaleMap ->
+                scaleMap.forEach { (key, data) ->
+                    // 排除主设备 2格秤
+                    if (data.deviceId == ScaleDeviceConfig.DEVICE_ID_2) return@forEach
+
+                    // 从槽位配置读取调料名，未配置则跳过
+                    val (goodsId, goodsName) = slotMap[key] ?: return@forEach
+
+                    // 首次收到稳定数据时记录基准重量
+                    val baseline = baselineMap[key]
+                    if (baseline == null) {
+                        if (data.state == WeightUtil.STATE_STABLE) {
+                            baselineMap[key] = data.weight
+                        }
+                        return@forEach
+                    }
+
+                    // 用量 = 初始重量 - 当前重量，负值归零
+                    val useWeight = (baseline - data.weight)
+                        .coerceAtLeast(0.0)
+                        .roundedOneDecimalPlace()
+
+                    // 更新原始用量 map，再按 goodsName 聚合刷新 adapter
+                    if (useWeight < 0.5) {
+                        rawWeightMap.remove(key)
+                    } else {
+                        rawWeightMap[key] = Triple(goodsId, goodsName, useWeight)
+                    }
+                    refreshAdapterByName(goodsName)
+                }
+            }
+        }
+    }
+
+    /**
+     * 按 goodsName 聚合 rawWeightMap，叠加历史用量后推给 adapter
+     * isCooking=true 时只新增，不移除（历史调料数据不可减少）
+     */
+    private fun refreshAdapterByName(goodsName: String) {
+        val grouped = rawWeightMap.values.filter { it.second == goodsName }
+        val newWeight = grouped.sumOf { it.third }.roundedOneDecimalPlace()
+        val (baseGoodsId, baseWeight) = baseSeasoningMap[goodsName] ?: ("" to 0.0)
+        val totalWeight = (newWeight + baseWeight).roundedOneDecimalPlace()
+        if (totalWeight < 0.5) {
+            // 制作中模式：已有历史数据，不允许移除
+            if (food?.isCooking != true) {
+                seasoningAdapter.removeItem(goodsName)
+            }
+            return
+        }
+        val goodsId = grouped.firstOrNull()?.first?.takeIf { it.isNotEmpty() } ?: baseGoodsId
+        seasoningAdapter.updateItem(
+            SeasoningWeightAdapter.Item(
+                goodsId = goodsId,
+                goodsName = goodsName,
+                useWeight = totalWeight
+            )
+        )
+    }

    private fun addViewListener() {
-        addWeightListener()
-        binding.btnWeightClear.setOnClickListener { WeightUtil.tareTwo(AddressUtil.TWO) }
-
        binding.btnCook.clickWithDebounce {
-            cook()
+            val content = getRemindSpannable("开始制作")
+            showRemindDialog(content) { cook() }
        }
-
+        binding.btnWeightClear.clickWithDebounce { WeightUtil.tareTwo(2) }
        binding.btnSubmit.clickWithDebounce {
            if (cookFoodEntity.foodWeight <= 0.toDouble()) {
                toast("未识别到菜品熟重")
                return@clickWithDebounce
            }
-            submit()
-        }
+            val content = getRemindSpannable("制作完成")
+            showRemindDialog(content) { submit() }
        }

-    private fun addWeightListener() {
-        WeightUtil.addWeightListener(
-            weightKey = TAG,
-            getWeight = { address, state, weight ->
+        // 监听主设备 2格秤的熟重
+        WeightUtil.addWeightListener(TAG) { address, _, weight ->
            if (address == AddressUtil.TWO) {
-                cookFoodEntity.foodWeight = weight.toDouble()
-                binding.tvTotalWeight.text = "${weight / 1000f}"
-            }
-            val firstWeight = firstGoodsArray.get(address, null)
-            if (firstWeight == null) {
-                //未设置数据
-                if (state != WeightUtil.STATE_STABLE) {
-                    //首次记录数据需要稳定数据
-                    return@addWeightListener
-                }
-                firstGoodsArray.put(address, weight)
-                return@addWeightListener
-            }
-            var realUseWeight = firstWeight - weight
-            realUseWeight = if (realUseWeight > 0) realUseWeight else 0.0
-            seasoningArray.put(address, realUseWeight.toDouble())
-
-//            refreshSeasoningWeight()
-
-            val item = seasoningItems.firstOrNull { address == addressArray[it.sort]}
-            item?.let {
-                val lastWeight = seasoningArray.get(address) ?: 0.toDouble()
-                it.useWeight = (lastWeight + getCookingSeasoning(address)).roundedOneDecimalPlace()
-                updateGridData(it)
-            }
-        })
-    }
-
-//    private fun refreshSeasoningWeight() {
-//        if (seasoningItems.isEmpty()) {
-//            return
-//        }
-//        seasoningItems.let { items ->
-//            addressArray.forEach { key, value ->
-//                items[key].useWeight =
-//                    (seasoningArray.get(value) ?: 0.toDouble()) + getCookingSeasoning(value)
-//            }
-//        }
-//        setGridData(seasoningItems)
-//    }
-
-    private fun updateGridData(entity:SeasoningEntity) {
-        val gridLayout = binding.include.root
-        val tag = entity.sort.toString()
-        val frameLayout = gridLayout.findViewWithTag<FrameLayout>(tag)
-        TextCellAdapter.loadLayout(frameLayout , entity)
-    }
-
-    private fun getCookingSeasoning(address: Int): Double {
-        if (isCooking.not()) return 0.toDouble()
-        if (seasoningItems.isEmpty()) return 0.toDouble()
-        val weight = seasoningCookingItems?.get(weightRelateArray2.get(address))?.useWeight ?: 0.toDouble()
-        return weight
-    }
-
-    private val weightRelateArray2 by lazy {
-        SparseIntArray().apply {
-            addressArray.forEach { key, value ->
-                put(value, key)
+                cookFoodEntity.foodWeight = weight
+                if (weight > 1000) {
+                    binding.tvTotalWeight.text = "${(weight / 1000f).roundedDecimalPlace(3)}"
+                    binding.tvWeightUnit.text = "千克"
+                } else {
+                    binding.tvTotalWeight.text = "$weight"
+                    binding.tvWeightUnit.text = "克"
                }
            }
        }
-
-    private val addressArray by lazy {
-        AddressUtil.getWeighAddressArray()
    }

-//    private fun prepareData(acton: () -> Unit) {
-//
-//        //只有制作和采样列表页面才能进入设置页面，提交页面无法进行设置，不存在调料数据被修改的问题
-//        val seasoningJson = realSeasoningData.toJsonString()
-//        val typeToken = object : TypeToken<List<CookFoodGoodsEntity>>() {}
-//        val tempSeasoningList = seasoningJson.toType(typeToken = typeToken)
-//        goodsList?.addAll(tempSeasoningList)
-//        acton()
-//
-//    }
-
    private fun cook() {
        if (food == null || goodsList.isNullOrEmpty()) {
            toast("未获取到菜品或构成信息")
            return
        }
-        val realSeasoningData = seasoningItems
-            //(binding.rvSeasoning.adapter as TextCellAdapter).list
-        if (realSeasoningData.isEmpty() && !isCooking) {
-            toast("未获取到调料信息")
-            return
-        }
-        if (realSeasoningData.isNotEmpty()&&realSeasoningData[0].goodsId.isNullOrBlank()) {
-            toast("还未设置调料信息，请去设置页面操作")
-            return
-        }
+        val seasoningData = seasoningAdapter.items
+//        if (seasoningData.isEmpty()) {
+//            toast("未获取到调料信息")
+//            return
+//        }
        showLoading()
-        //只有制作和采样列表页面才能进入设置页面，提交页面无法进行设置，不存在调料数据被修改的问题
-        val seasoningJson = realSeasoningData.toJsonString()
-        val typeToken = object : TypeToken<List<CookFoodGoodsEntity>>() {}
-        val tempSeasoningList = seasoningJson.toType(typeToken = typeToken)
+
+        // 将调料数据转为 CookFoodGoodsEntity 追加到 goodsList
+//        val typeToken = object : TypeToken<List<CookFoodGoodsEntity>>() {}
+        val tempSeasoningList = seasoningData.map { item ->
+            CookFoodGoodsEntity().also { entity ->
+                entity.goodsId = item.goodsId
+                entity.goodsName = item.goodsName
+                entity.useWeight = item.useWeight
+                entity.materialType = 3
+            }
+        }
        goodsList?.addAll(tempSeasoningList)
+
        cookFoodEntity.let {
            it.dinnerType = when (it.dinnerType) {
                "早餐" -> "1"
@@ -283,27 +324,23 @@ class SubmitFoodActivity : BaseActivity() {
                else -> it.dinnerType
            }
        }
+
        val isSamplingData = food!!.cookMode == 1
        if (isSamplingData) {
-            //生成临时foodId，解决采样模式没有foodId，无法关联数据的问题
            val tempFoodId = cookFoodEntity.foodId.ifBlank { "${System.currentTimeMillis()}" }
            cookFoodEntity.foodId = tempFoodId
        }
-        //全部设置同一foodId
-        goodsList?.forEach {
-            it.foodId = cookFoodEntity.foodId
-        }
-        //保存菜品-保存主辅料调料
+        goodsList?.forEach { it.foodId = cookFoodEntity.foodId }
+
+        lifecycleScope.launch {
            appViewModel.saveCookFoodAndGoods(
                cookMode = food!!.cookMode,
                entity = cookFoodEntity,
-            list = goodsList,
-            onFinish = {
-                runOnUiThread {
+                list = goodsList
+            )
            dismissLoading()
            jumpPage(isSamplingData, true)
        }
-            })
    }

    private fun submit() {
@@ -311,31 +348,23 @@ class SubmitFoodActivity : BaseActivity() {
            toast("未获取到菜品或构成信息")
            return
        }
-        val realSeasoningData = seasoningItems
-        if (realSeasoningData.isEmpty() && !isCooking) {
-            toast("未获取到调料信息")
-            return
-        }
-        if (realSeasoningData.isNotEmpty()&&realSeasoningData[0].goodsId.isNullOrBlank()) {
-            toast("还未设置调料信息，请去设置页面操作")
-            return
-        }
+        val seasoningData = seasoningAdapter.items
        showLoading()
-        //只有制作和采样列表页面才能进入设置页面，提交页面无法进行设置，不存在调料数据被修改的问题
-        val seasoningJson = realSeasoningData.toJsonString()
-        val typeToken = object : TypeToken<List<CookFoodGoodsEntity>>() {}
-        val tempSeasoningList = seasoningJson.toType(typeToken = typeToken)
-        tempSeasoningList.forEach { entity ->
-            val realWeight = entity.useWeight ?: 0.toDouble()
-            val filterData = goodsList?.firstOrNull { it.goodsId == entity.goodsId }
-            //确保重量大于0，且无重复数据
-            if (realWeight > 0.toDouble() && filterData == null) {
-                goodsList?.add(entity)
+
+        // 将重量大于0且不重复的调料追加到 goodsList
+        seasoningData.forEach { item ->
+            if (item.useWeight > 0.0 && goodsList?.none { it.goodsId == item.goodsId } == true) {
+                goodsList?.add(CookFoodGoodsEntity().also { entity ->
+                    entity.goodsId = item.goodsId
+                    entity.goodsName = item.goodsName
+                    entity.useWeight = item.useWeight
+                    entity.materialType = 3
+                })
            }
        }

        cookFoodEntity.let {
-            it.stFoodInfoConstituteList = this@SubmitFoodActivity.goodsList
+            it.matchingConstituteInfoList = this@SubmitFoodActivity.goodsList
            it.dinnerType = when (it.dinnerType) {
                "1" -> "早餐"
                "2" -> "午餐"
@@ -346,37 +375,25 @@ class SubmitFoodActivity : BaseActivity() {

        val isSamplingData = food!!.cookMode == 1
        if (isSamplingData) {
-            //采样模式没有foodId
            cookFoodEntity.foodId = ""
            goodsList?.forEach { it.foodId = "" }
        }
-        val json = cookFoodEntity.toJsonString()
-        Log.d(TAG, "submit: json=$json")
-        HttpUtil.postJson(
-            url = UrlConfig.SUBMIT_DISH,
-            json = json,
-            doSuccess = {
-                Log.d(TAG, "submit: postJson=$it")
-                submitSuccess(isSamplingData)
-            }, doFailure = { code, msg ->
-                Log.d(TAG, "submit: postJson:code=$code,msg=$msg")
-                toast(msg)
-                dismissLoading()
-            })
+
+        Log.d(TAG, "submit: json=${cookFoodEntity.toJsonString()}")
+        netViewModel.submitCookFood(entity = cookFoodEntity)
    }

    private fun submitSuccess(isSamplingData: Boolean) {
        if (food?.foodId.isNullOrBlank()) {
-            //本地无删除数据直接跳转页面
            dismissLoading()
            jumpPage(isSamplingData, false)
            return
        }
-        //删除本地数据
+        lifecycleScope.launch {
            appViewModel.deleteCookFoodAndGoods(
                cookMode = food!!.cookMode,
                foodId = food!!.foodId!!
-        ) {
+            )
            dismissLoading()
            jumpPage(isSamplingData, false)
        }
@@ -395,61 +412,41 @@ class SubmitFoodActivity : BaseActivity() {
        }
    }

-    private lateinit var appViewModel: AppViewModel

-    private fun initViewModel() {
-        val db = BaseApp.instance!!.database
-        val factory =
-            AppFactory(AppRepository(db.appDao()))
-        appViewModel =
-            ViewModelProvider(this, factory)[AppViewModel::class.java]
+    override fun onDestroy() {
+        WeightUtil.removeWeightListener(TAG)
+        super.onDestroy()
    }

-    override fun onResume() {
-        super.onResume()
-        if (isCooking.not()) {
-            //烹饪中使用本地数据，未烹饪则使用默认的调料配置数据
-            appViewModel.loadSeasoning {
-                Log.d(TAG, "onResume: loadSeasoning:${it.toJsonString()}")
-                loadTextCell(it)
-            }
-        }
+    /**
+     * 未保存数据提醒dialog
+     */
+    private fun remindSaveDataDialog() {
+        CommonDialog(this)
+            .setTitle("温馨提示")
+            .setContent("请确认是否存在未保存的数据？")
+            .setNegativeButton("取消，留在页面")
+            .setNeutralButton("返回上页，不保存") { finish() }
+            .setPositiveButton("保存为烹饪中菜品") { cook() }
+            .show()
    }

-    private var seasoningItems = mutableListOf<SeasoningEntity>()
-    private var seasoningCookingItems: List<SeasoningEntity> ?= null
-    private fun loadTextCell(list: MutableList<SeasoningEntity>) {
-        seasoningItems.clear()
-        seasoningItems.addAll(list)
-        initConfigData()
-//        setGridData(list)
-        list.forEach { entity ->
-            //烹饪中重量数据从本地获取，否则显示0
-            if (isCooking.not()) {
-                entity.useWeight = 0.0
-            }
-            updateGridData(entity)
-        }
-        seasoningCookingItems = seasoningItems.map { it.copy() }.toList()
+    /**
+     * 点击制作和提交按钮确认dialog
+     */
+    private fun showRemindDialog(content: CharSequence, action: () -> Unit) {
+        CommonDialog(this)
+            .setTitle("温馨提示")
+            .setContent(content)
+            .setNegativeButton("取消")
+            .setPositiveButton("确认") { action() }
+            .show()
    }

-    private fun initConfigData() {
-        repeat(12) {num->
-            val firstOne = seasoningItems.firstOrNull {it.sort == num}
-            if (firstOne == null) {
-                seasoningItems.add(SeasoningEntity().also { it.sort = num })
-            }
-        }
+    private fun getRemindSpannable(cookStateText: String) = buildSpannableString {
+        appendText("请确认是否 ")
+        appendText(cookStateText, StyleSpan(Typeface.BOLD), ForegroundColorSpan(Color.BLACK))
+        appendText(" ？")
    }

-    private fun setGridData(list: MutableList<SeasoningEntity>) {
-        val gridLayout = binding.include.root
-        list.forEach { entity ->
-            val tag = entity.sort.toString()
-            val frameLayout = gridLayout.findViewWithTag<FrameLayout>(tag)
-            TextCellAdapter.loadLayout(frameLayout, entity)
 }
-    }
-}
-
-
--- a/Show More
+++ b/Show More