feat(fragment): 新增 DbInspectFragment 本地数据库调试查看功能

- 新增 DbInspectFragment，支持按表切换（菜品/食材/调料/槽位）查看全量数据
- 分页加载（每页 50 条）+ isDel 过滤开关，避免大数据量时内存占用过高
- 切换 Tab 立即清空旧数据防止闪现，loadMoreDbInspect 加并发保护
- 槽位表字段少无 isDel，切换到该 Tab 时自动隐藏 isDel 相关控件
- 菜品/食材/调料表字段改为每行 3 列紧凑布局，槽位表保持逐行显示
- SettingActivity 新增"数据库查看"入口，复用 SingleFragmentActivity 承载
- 4 个 DAO 新增分页查询及计数方法，DbRepository/DbViewModel 同步扩展

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

.gitignore

@@ -1,15 +1,15 @@
 *.iml
 .gradle
 /local.properties
-/.idea/caches
+/.idea/
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
 .DS_Store
 /build
 /captures
 .externalNativeBuild
 .cxx
 local.properties
+.claude/
+app/debug/
+app/release/
+# 临时忽略 assets 下的 .pt 模型文件，正式文件就绪后取消此行
+app/src/main/assets/*.pt

.idea/.gitignore

@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml

.idea/AndroidProjectSystem.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>

.idea/compiler.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="21" />
-  </component>
-</project>

.idea/deploymentTargetSelector.xml

@@ -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="2026-01-28T08:24:39.059017600Z">
-          <Target type="DEFAULT_BOOT">
-            <handle>
-              <DeviceId pluginId="Default" identifier="serial=192.168.1.80:5555;connection=d6ad651e" />
-            </handle>
-          </Target>
-        </DropdownSelection>
-        <DialogSelection />
-      </SelectionState>
-    </selectionStates>
-  </component>
-</project>

.idea/deviceManager.xml

@@ -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>

.idea/gradle.xml

@@ -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>

.idea/migrations.xml

@@ -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>

.idea/misc.xml

@@ -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>

.idea/runConfigurations.xml

@@ -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>

.kotlin/errors/errors-1755144467627.log

@@ -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
+

SwipeRecyclerView.md

@@ -0,0 +1,356 @@
+# SwipeRecyclerView
+
+作者的主页：[https://www.yanzhenjie.com](https://www.yanzhenjie.com)  
+技术交流群：[46505645](https://jq.qq.com/?_wv=1027&k=5wY8UWl)  
+
+----
+
+本库是基于RecyclerView的封装，提供了Item侧滑菜单、Item滑动删除、Item长按拖拽、添加HeaderView/FooterView、加载更多、Item点击监听等基本功能。
+
+## 特性
+1. Item侧滑菜单，支持水平分布、垂直分布
+2. Item长按拖拽、侧滑删除
+3. 添加/移除HeaderView/FooterView
+4. **自动/点击**加载更多的功能
+5. 支持二级列表，List形式、Grid形式、Staggered形式
+6. Sticky普通布局黏贴和ReyclerView分组黏贴
+7. 支持AndroidX
+
+> 使用本库只需要使用SwipeRecyclerView即可，用法和原生RecyclerView一模一样，本库比原生的RecyclerView多了几个扩展方法。
+
+## 截图
+对上面提到的效果基本都有演示，但不是全部，更多效果可以下载Demo查看。
+
+### Item侧滑菜单
+<img src="./image/1.gif" width="180px"/> <img src="./image/2.gif" width="180px"/> <img src="./image/3.gif" width="180px"/>
+
+### Item侧滑删除、拖拽
+<img src="./image/4.gif" width="180px"/> <img src="./image/5.gif" width="180px"/> <img src="./image/6.gif" width="180px"/>
+
+### 下拉刷新和加载更多
+<img src="./image/7.gif" width="180px"/>
+
+### HeaderView和FooterView
+<img src="./image/8.gif" width="180px"/>
+
+### Sticky效果和Item分组
+<img src="./image/9.gif" width="180px"/>  <img src="./image/10.gif" width="180px"/>
+
+### 和DrawerLayout嵌套
+<img src="./image/11.gif" width="180px"/>
+
+## 如何使用
+如果你使用的是android support库，那么请添加下述依赖：
+```groovy
+implementation 'com.yanzhenjie.recyclerview:support:1.3.2'
+```
+
+如果你使用的是android x库，那么请添加下述依赖：
+```groovy
+implementation 'com.yanzhenjie.recyclerview:x:1.3.2'
+```
+
+> **1. SwipeRecyclerView从1.3.0版本开始支持AndroidX和二级列表，因此相对于低版本的包名和类名有所改动，从低版本升级的开发者需要考量是否要升级。**  
+**2. 为了让开发者方便切换support库和x库，SwipeRecyclerView的support库和x库除了依赖时的名称不一样外，包名、控件名和类名都是一样的，因此两个库不能共存。**  
+
+### 加入布局
+在布局的xml中加入`SwipeRecyclerView`：
+```xml
+<com.yanzhenjie.recyclerview.SwipeRecyclerView
+    .../>
+```
+
+### ItemDecoration
+也就是分割线，支持Grid形式和Linear形式，可以选择某个ViewType不画分割线：
+```java
+// 默认构造，传入颜色即可。
+ItemDecoration itemDecoration = new DefaultDecoration(color);
+
+// 或者：颜色，宽，高，最后一个参数是不画分割线的ViewType，可以传入多个。
+itemDecoration = new DefaultDecoration(color, width, height, excludeViewType);
+
+// 或者：例如下面的123都是不画分割线的ViewType：
+itemDecoration = new DefaultDecoration(color, width, height, 1, 2, 3);
+
+SwipeRecyclerView recyclerView = ...;
+recyclerView.setDecoration(itemDecoration);
+```
+
+### Item点击监听
+```java
+recyclerView.setOnItemClickListener(new OnItemClickListener() {
+    @Override
+    public void onItemClick(View view, int position) {
+        // TODO...
+    }
+});
+```
+
+### 侧滑菜单
+```java
+// 设置监听器。
+swipeRecyclerView.setSwipeMenuCreator(mSwipeMenuCreator);
+
+// 创建菜单：
+SwipeMenuCreator mSwipeMenuCreator = new SwipeMenuCreator() {
+    @Override
+    public void onCreateMenu(SwipeMenu leftMenu, SwipeMenu rightMenu, int position) {
+        SwipeMenuItem deleteItem = new SwipeMenuItem(mContext)
+            ...; // 各种文字和图标属性设置。
+        leftMenu.addMenuItem(deleteItem); // 在Item左侧添加一个菜单。
+
+        SwipeMenuItem deleteItem = new SwipeMenuItem(mContext)
+            ...; // 各种文字和图标属性设置。
+        leftMenu.addMenuItem(deleteItem); // 在Item右侧添加一个菜单。
+        
+        // 注意：哪边不想要菜单，那么不要添加即可。
+    }
+};
+
+// 菜单点击监听。
+swipeRecyclerView.setOnItemMenuClickListener(mItemMenuClickListener);
+
+OnItemMenuClickListener mItemMenuClickListener = new OnItemMenuClickListener() {
+    @Override
+    public void onItemClick(SwipeMenuBridge menuBridge, int position) {
+        // 任何操作必须先关闭菜单，否则可能出现Item菜单打开状态错乱。
+        menuBridge.closeMenu();
+        
+        // 左侧还是右侧菜单：
+        int direction = menuBridge.getDirection();
+        // 菜单在Item中的Position：
+        int menuPosition = menuBridge.getPosition();
+    }
+};
+```
+
+**注意**：菜单需要设置高度，关于菜单高度：
+1. `MATCH_PARENT`，自动适应Item高度，保持和Item一样高，比较推荐;
+2. 指定具体的高，比如80;
+3. `WRAP_CONTENT`，自身高度，极不推荐;
+
+### 侧滑删除和拖拽
+拖拽和侧滑删除的功能默认关闭的，所以先要打开功能：
+```java
+recyclerView.setLongPressDragEnabled(true); // 拖拽排序，默认关闭。
+recyclerView.setItemViewSwipeEnabled(true); // 侧滑删除，默认关闭。
+```
+
+只需要设置上面两个属性就可以进行相应的动作了，如果不需要哪个，不要打开就可以了。
+
+然后监听拖拽和侧滑的动作，进行数据更新：
+```java
+recyclerView.setOnItemMoveListener(mItemMoveListener);// 监听拖拽，更新UI。
+
+OnItemMoveListener mItemMoveListener = new OnItemMoveListener() {
+    @Override
+    public boolean onItemMove(ViewHolder srcHolder, ViewHolder targetHolder) {
+        // 此方法在Item拖拽交换位置时被调用。
+        // 第一个参数是要交换为之的Item，第二个是目标位置的Item。
+
+        // 交换数据，并更新adapter。
+        int fromPosition = srcHolder.getAdapterPosition();
+        int toPosition = targetHolder.getAdapterPosition();
+        Collections.swap(mDataList, fromPosition, toPosition);
+        adapter.notifyItemMoved(fromPosition, toPosition);
+
+        // 返回true，表示数据交换成功，ItemView可以交换位置。
+        return true;
+    }
+
+    @Override
+    public void onItemDismiss(ViewHolder srcHolder) {
+        // 此方法在Item在侧滑删除时被调用。
+
+        // 从数据源移除该Item对应的数据，并刷新Adapter。
+        int position = srcHolder.getAdapterPosition();
+        mDataList.remove(position);
+        adapter.notifyItemRemoved(position);
+    }
+};
+```
+
+**特别注意**：如果`LayoutManager`是`List`形式，那么Item拖拽时只能从1-2-3-4这样走，如果你的`LayoutManager`是`Grid`形式的，那么Item可以从1直接到3或者5或者6...，这样数据就会错乱，所以**当`LayoutManager`是Grid形式时**这里要特别注意转换数据位置的算法：
+```java
+@Override
+public boolean onItemMove(ViewHolder srcHolder, ViewHolder targetHolder) {
+    int fromPosition = srcHolder.getAdapterPosition();
+    int toPosition = targetHolder.getAdapterPosition();
+    if (fromPosition < toPosition) {
+        for (int i = fromPosition; i < toPosition; i++) {
+            Collections.swap(mDataList, i, i + 1);
+        }
+    } else {
+        for (int i = fromPosition; i > toPosition; i--) {
+            Collections.swap(mDataList, i, i - 1);
+        }
+    }
+
+    mMenuAdapter.notifyItemMoved(fromPosition, toPosition);
+    return true;
+}
+```
+
+我们还可以监听用户的侧滑删除和拖拽Item时的手指状态：
+```java
+recyclerView.setOnItemStateChangedListener(mStateChangedListener);
+
+...
+
+private OnItemStateChangedListener mStateChangedListener = (viewHolder, actionState) -> {
+    if (actionState == OnItemStateChangedListener.ACTION_STATE_DRAG) {
+        // 状态：正在拖拽。
+    } else if (actionState == OnItemStateChangedListener.ACTION_STATE_SWIPE) {
+        // 状态：滑动删除。
+    } else if (actionState == OnItemStateChangedListener.ACTION_STATE_IDLE) {
+        // 状态：手指松开。
+    }
+};
+```
+
+想用户触摸到某个`Item`时就开始拖拽或者侧滑删除时，只需要调用`startDrag()`和`startSwipe()`并转入当前`Item`的`ViewHoler`即可。
+
+触摸拖拽：
+```java
+swipeRecyclerView.startDrag(ViewHolder);
+```
+
+触摸侧滑删除：
+```java
+swipeRecyclerView.startSwipe(ViewHolder);
+```
+
+### HeaderView和FooterView
+主要方法：
+```java
+addHeaderView(View); // 添加HeaderView。
+removeHeaderView(View); // 移除HeaderView。
+addFooterView(View); // 添加FooterView。
+removeFooterView(View); // 移除FooterView。
+getHeaderItemCount(); // 获取HeaderView个数。
+getFooterItemCount(); // 获取FooterView个数。
+getItemViewType(int); // 获取Item的ViewType，包括HeaderView、FooterView、普通ItemView。
+```
+添加/移除`HeaderView`/`FooterView`和`setAdapter()`的调用不分先后顺序。
+
+**特别注意**：
+1. 如果添加了`HeaderView`，凡是通过`ViewHolder`拿到的`position`都要减掉`HeaderView`的数量才能得到正确的`position`。
+
+### 加载更多
+本库默认提供了加载更多的动画和View，开发者也可以自定义，默认支持`RecyclerView`自带的三种布局管理器。
+
+默认加载更多：
+```java
+RecyclerView recyclerView = ...；
+...
+
+recyclerView.useDefaultLoadMore(); // 使用默认的加载更多的View。
+recyclerView.setLoadMoreListener(mLoadMoreListener); // 加载更多的监听。
+
+LoadMoreListener mLoadMoreListener = new LoadMoreListener() {
+    @Override
+    public void onLoadMore() {
+        // 该加载更多啦。
+        
+        ... // 请求数据，并更新数据源操作。
+        mMainAdapter.notifyDataSetChanged();
+
+        // 数据完更多数据，一定要调用这个方法。
+        // 第一个参数：表示此次数据是否为空。
+        // 第二个参数：表示是否还有更多数据。
+        mRecyclerView.loadMoreFinish(false, true);
+
+        // 如果加载失败调用下面的方法，传入errorCode和errorMessage。
+        // errorCode随便传，你自定义LoadMoreView时可以根据errorCode判断错误类型。
+        // errorMessage是会显示到loadMoreView上的，用户可以看到。
+        // mRecyclerView.loadMoreError(0, "请求网络失败");
+    }
+};
+```
+
+自定义加载更多View也很简单，自定义一个View，并实现一个接口即可：
+```java
+public class DefineLoadMoreView extends LinearLayout
+        implements SwipeRecyclerView.LoadMoreView,
+        View.OnClickListener {
+
+    private LoadMoreListener mLoadMoreListener;
+
+    public DefineLoadMoreView(Context context) {
+        super(context);
+        ...
+        setOnClickListener(this);
+    }
+
+    /**
+     * 马上开始回调加载更多了，这里应该显示进度条。
+     */
+    @Override
+    public void onLoading() {
+        // 展示加载更多的动画和提示信息。
+        ...
+    }
+
+    /**
+     * 加载更多完成了。
+     *
+     * @param dataEmpty 是否请求到空数据。
+     * @param hasMore   是否还有更多数据等待请求。
+     */
+    @Override
+    public void onLoadFinish(boolean dataEmpty, boolean hasMore) {
+        // 根据参数，显示没有数据的提示、没有更多数据的提示。
+        // 如果都不存在，则都不用显示。
+    }
+
+    /**
+     * 加载出错啦，下面的错误码和错误信息二选一。
+     *
+     * @param errorCode    错误码。
+     * @param errorMessage 错误信息。
+     */
+    @Override
+    public void onLoadError(int errorCode, String errorMessage) {
+    }
+
+    /**
+     * 调用了setAutoLoadMore(false)后，在需要加载更多的时候，此方法被调用，并传入listener。
+     */
+    @Override
+    public void onWaitToLoadMore(SwipeRecyclerView.LoadMoreListener loadMoreListener) {
+        this.mLoadMoreListener = loadMoreListener;
+        }
+
+    /**
+     * 非自动加载更多时mLoadMoreListener才不为空。
+     */
+    @Override
+    public void onClick(View v) {
+        if (mLoadMoreListener != null) mLoadMoreListener.onLoadMore();
+    }
+}
+```
+
+## 感谢与参考
+* [cube-sdk](https://github.com/liaohuqiu/cube-sdk)
+* [SwipeMenu](https://github.com/TUBB/SwipeMenu/)
+* [HeaderAndFooterWrapper](https://github.com/hongyangAndroid/baseAdapter/blob/master/baseadapter-recyclerview/src/main/java/com/zhy/adapter/recyclerview/wrapper/HeaderAndFooterWrapper.java)
+
+加载更多的灵感来自`cube-sdk`，侧滑菜单参考了`SwipeMenu`，添加`HeaderView`参考了`HeaderAndFooterWrapper`类，特别感谢上述开源库及其作者。
+
+## License
+```text
+Copyright 2019 Zhenjie Yan
+
+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.
+```

app/build.gradle.kts

@@ -1,8 +1,14 @@
 
 plugins {
-    alias(libs.plugins.android.application)
+//    alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
+//    alias(libs.plugins.kotlin.android)
-    id("com.google.devtools.ksp") version "2.0.21-1.0.27"
+//    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,32 +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.google.code.gson:gson:2.10.1")
+    implementation(libs.gson)
-    implementation("com.squareup.okhttp3:okhttp:4.9.1")
+    implementation(libs.okhttp)
-    implementation("com.squareup.okhttp3:logging-interceptor:4.9.1")
+    implementation(libs.logging.interceptor)
-    implementation("com.squareup.retrofit2:retrofit:2.9.0")
+    implementation(libs.retrofit)
-    implementation("com.squareup.retrofit2:converter-gson:2.9.0")
+    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")
+    // room
-    ksp("androidx.room:room-compiler:2.5.2")
+    implementation(libs.androidx.room.runtime)
-    implementation("androidx.room:room-ktx:2.5.2") // Kotlin扩展
+    ksp(libs.androidx.room.compiler)
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
+    implementation(libs.androidx.room.ktx)
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7")
-    implementation("androidx.activity:activity-ktx:1.8.0")
 
 //    implementation("biz.laenger.android:vpbs:0.0.6")
 
-    //必须 1.0.0 以上
+    // refresh-layout
-    implementation("io.github.scwang90:refresh-layout-kernel:3.0.0-alpha")
+    implementation(libs.refresh.layout.kernel)
-    //核心必须依赖
+    implementation(libs.refresh.header.classics)
-    implementation("io.github.scwang90:refresh-header-classics:3.0.0-alpha")
+    implementation(libs.refresh.header.radar)
-    //经典刷新头
+    implementation(libs.refresh.footer.classics)
-    implementation("io.github.scwang90:refresh-header-radar:3.0.0-alpha")
-    implementation("io.github.scwang90:refresh-footer-classics:3.0.0-alpha")
-    //经典加载
 
     //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")

app/objectbox-models/default.json

@@ -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
+}

app/src/main/AndroidManifest.xml

@@ -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"
+    xmlns:tools="http://schemas.android.com/tools">
-    android:sharedUserId="android.uid.system">
+    <!--  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:name=".ui.CookingModeActivity"
+            android:theme="@style/Theme.DishMatch.NoSplash"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
-            android:name=".ui.PrepareCookActivity"
+            android:name=".ui.PrepareFoodActivity"
+            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.DishSamplingActivity"
+            android:name=".ui.SamplingModeActivity"
-            android:screenOrientation="portrait"
+            android:theme="@style/Theme.DishMatch.NoSplash"
-            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
-        <activity
-            android:name=".ui.SamplingListActivity"
             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.DeviceConfigActivity"-->
-        <activity android:name="com.shuwei.dish.match.ui.SubmitFoodActivity" />
+<!--            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"

app/src/main/assets/data/class_info.json

@@ -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"
+}

app/src/main/java/com/shuwei/dish/match/adapter/CollectedFoodAdapter.kt

@@ -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}"
+    }
+}

app/src/main/java/com/shuwei/dish/match/adapter/DishPartAdapter.kt

@@ -1,57 +0,0 @@
-package com.shuwei.dish.match.adapter
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.core.content.ContextCompat
-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.ListItemDishCookBinding
-import com.shuwei.dish.match.entity.CookFoodGoodsEntity
-import com.shuwei.dish.match.utils.ext.roundedOneDecimalPlace
-import java.text.DecimalFormat
-
-class DishPartAdapter(list: MutableList<CookFoodGoodsEntity>) :
-    BaseQuickAdapter<CookFoodGoodsEntity, DishPartAdapter.VH>(list) {
-
-    inner class VH(var binding: ListItemDishCookBinding) : QuickViewHolder(binding.root)
-
-    override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
-        val inflater = LayoutInflater.from(context)
-        val binding = ListItemDishCookBinding.inflate(inflater, parent, false)
-        return VH(binding)
-    }
-
-    override fun onBindViewHolder(holder: VH, position: Int, item: CookFoodGoodsEntity?) {
-        holder.binding.run {
-            tvDishName.text = item!!.goodsName
-            tvDishType.text = if (item.materialType == 1) "主辅材：主材" else if (item.materialType == 2) "主辅材：辅材" else ""
-            //"${DecimalFormat("#").format(item.useWeight)}克"
-            tvDishWeight.text =
-                if (item.useWeight == null || item.useWeight == 0.toDouble()) "" else "${item.useWeight!!.roundedOneDecimalPlace()}克"
-            tvDishWeight.setTextColor(
-                ContextCompat.getColor(
-                    context,
-                    if (item.isSamplingPage) R.color.black999 else R.color.dish_green
-                )
-            )
-            ivOperateIcon.setImageResource(
-                if (item.isSamplingPage)
-                //采集页面
-                    R.drawable.ic_delete
-                else
-                //制作页面
-                    if (item.isSetFinished) R.drawable.ic_dish_selected
-                    else R.drawable.ic_dish_unselected
-            )
-            root.run {
-                setBackgroundResource(
-                    if (item.isItemClicked) R.drawable.shape_item_cook_dish
-                    else R.drawable.shape_white_fb_15_corners
-                )
-            }
-        }
-    }
-
-}

app/src/main/java/com/shuwei/dish/match/adapter/DishShowAdapter.kt

@@ -1,62 +0,0 @@
-package com.shuwei.dish.match.adapter
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.core.content.ContextCompat
-import com.chad.library.adapter4.BaseQuickAdapter
-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
-
-class DishShowAdapter(list: MutableList<FoodRecord>) :
-    BaseQuickAdapter<FoodRecord, DishShowAdapter.VH>(list) {
-
-    inner class VH(var binding: ListItemDishBinding) : QuickViewHolder(binding.root)
-
-    override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
-        val inflater = LayoutInflater.from(context)
-        val binding = ListItemDishBinding.inflate(inflater, parent, false)
-        return VH(binding)
-    }
-
-    override fun onBindViewHolder(holder: VH, position: Int, item: FoodRecord?) {
-        holder.binding.run {
-            val isCooking = item!!.isCooking
-            val totalWeight = item.totalWeight ?: 0.toDouble()
-            tvDishName.text = item!!.foodName
-            if (isCooking) {
-                tvDishName.setTextColor(
-                    ContextCompat.getColor(holder.itemView.context, R.color.black)
-                )
-                clBlock.setBackgroundResource(R.drawable.shape_white_fb_15_corners)
-                tvDishCount.visible()
-                tvDishCount.text = "制作统计：-kg"
-                tvShowState.text = "烹饪中"
-            } else if (totalWeight > 0.toDouble()) {
-                tvDishName.setTextColor(
-                    ContextCompat.getColor(holder.itemView.context, R.color.dish_green)
-                )
-                clBlock.setBackgroundResource(R.drawable.shape_white_fb_15_corners)
-                tvDishCount.visible()
-                tvDishCount.text =
-                    "累计统计：${df.format(totalWeight / 1000.0F)}kg(${item.count}次)"
-                tvShowState.text = "${df.format((item.foodWeight ?: 0.toDouble()) / 1000.0F)}kg"
-            } else {
-                tvDishName.setTextColor(
-                    ContextCompat.getColor(holder.itemView.context, R.color.black999)
-                )
-                clBlock.setBackgroundResource(R.drawable.shape_white_dash_15_corners)
-                tvDishCount.gone()
-                tvShowState.text = "-"
-            }
-        }
-    }
-
-    val df = DecimalFormat("0.000")
-
-}

app/src/main/java/com/shuwei/dish/match/adapter/Food2Adapter.kt

@@ -5,13 +5,16 @@ 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.ListItemDishRecordBinding
+import com.shuwei.dish.match.databinding.ListItemFood2Binding
 import com.shuwei.dish.match.entity.FoodRecord
 
-class FoodRecordAdapter(list: MutableList<FoodRecord>) :
+/**
-    BaseQuickAdapter<FoodRecord, FoodRecordAdapter.VH>(list) {
+ * 菜品搜索页面的适配器
+ */
+class Food2Adapter(list: MutableList<FoodRecord>) :
+    BaseQuickAdapter<FoodRecord, Food2Adapter.VH>(list) {
 
-    inner class VH(var binding: ListItemDishRecordBinding) : QuickViewHolder(binding.root)
+    inner class VH(var binding: ListItemFood2Binding) : QuickViewHolder(binding.root)
 
     override fun onBindViewHolder(
         holder: VH,
@@ -27,7 +30,7 @@ class FoodRecordAdapter(list: MutableList<FoodRecord>) :
         viewType: Int
     ): VH {
         val inflater = LayoutInflater.from(context)
-        val binding = ListItemDishRecordBinding.inflate(inflater, parent, false)
+        val binding = ListItemFood2Binding.inflate(inflater, parent, false)
         return VH(binding)
     }
 }

app/src/main/java/com/shuwei/dish/match/adapter/Food3Adapter.kt

@@ -0,0 +1,40 @@
+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.ListItemFood3Binding
+import com.shuwei.dish.match.entity.GoodsItem
+
+/**
+ * 向量采集页面的适配器
+ */
+class Food3Adapter(list: MutableList<GoodsItem>) :
+    BaseQuickAdapter<GoodsItem, Food3Adapter.VH>(list) {
+
+    override fun onBindViewHolder(
+        holder: VH,
+        position: Int,
+        item: GoodsItem?
+    ) {
+        item ?: return
+        holder.binding.tvFoodName.run {
+            text = item.goodsName
+            isChecked = item.isClicked
+        }
+    }
+
+    override fun onCreateViewHolder(
+        context: Context,
+        parent: ViewGroup,
+        viewType: Int
+    ): VH {
+        val binding = ListItemFood3Binding.inflate(LayoutInflater.from(context), parent, false)
+        return VH(binding)
+    }
+
+    inner class VH(var binding: ListItemFood3Binding) : QuickViewHolder(binding.root)
+
+}

app/src/main/java/com/shuwei/dish/match/adapter/FoodAdapter.kt

@@ -0,0 +1,65 @@
+package com.shuwei.dish.match.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+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.ListItemFoodBinding
+import com.shuwei.dish.match.entity.GoodsItem
+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 FoodAdapter(list: MutableList<GoodsItem>) :
+    BaseQuickAdapter<GoodsItem, FoodAdapter.VH>(list) {
+
+    override fun onBindViewHolder(
+        holder: VH,
+        position: Int,
+        item: GoodsItem?
+    ) {
+        item ?: return
+        holder.binding.tvGoodsInfo.run {
+            text = item.goodsName
+            setBackgroundResource(
+                if (item.isClicked) R.drawable.shape_green_stroke
+                else R.drawable.shape_white_12_corners
+            )
+            setTextColor(
+                ContextCompat.getColor(
+                    context,
+                    if (item.isClicked) R.color.dish_green
+                    else R.color.black666
+                )
+            )
+        }
+        if (item.foodScore == -1) {
+            holder.binding.tvFoodScore.gone()
+        } else {
+            holder.binding.tvFoodScore.let {
+                it.visible()
+                val foodScoreText = "${(item.foodScore / 100.0).roundedDecimalPlace(2)}%"
+                it.text = foodScoreText
+            }
+        }
+    }
+
+    override fun onCreateViewHolder(
+        context: Context,
+        parent: ViewGroup,
+        viewType: Int
+    ): VH {
+        val binding =
+            ListItemFoodBinding.inflate(LayoutInflater.from(context), parent, false)
+        return VH(binding)
+    }
+
+    inner class VH(var binding: ListItemFoodBinding) : QuickViewHolder(binding.root)
+
+}

app/src/main/java/com/shuwei/dish/match/adapter/FoodListAdapter.kt

@@ -0,0 +1,98 @@
+package com.shuwei.dish.match.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+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.ListItemFoodListBinding
+import com.shuwei.dish.match.entity.FoodRecord
+import com.shuwei.dish.match.utils.ext.gone
+import com.shuwei.dish.match.utils.ext.visible
+import java.text.DecimalFormat
+
+/**
+ * 菜品列表通用 Adapter，合并了 DishShowAdapter 与 SamplingAdapter 的功能。
+ *
+ * @param list 数据列表
+ * @param mode 显示模式：
+ *   - [DisplayMode.COOKING_MODE]：制作模式，支持空状态（虚线边框、隐藏统计行、灰色文字）
+ *   - [DisplayMode.SAMPLING_MODE]：采样模式，始终显示统计行，重量为零时显示 `-`
+ */
+class FoodListAdapter(
+    list: MutableList<FoodRecord>,
+    private val mode: DisplayMode = DisplayMode.COOKING_MODE
+) : BaseQuickAdapter<FoodRecord, FoodListAdapter.VH>(list) {
+
+    /** 显示模式枚举 */
+    enum class DisplayMode {
+        /** 制作模式（原 DishShowAdapter 逻辑） */
+        COOKING_MODE,
+        /** 采样模式（原 SamplingAdapter 逻辑） */
+        SAMPLING_MODE
+    }
+
+    /** item 主体点击回调 */
+    var onItemClick: ((position: Int) -> Unit)? = null
+
+    inner class VH(var binding: ListItemFoodListBinding) : QuickViewHolder(binding.root)
+
+    override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
+        val binding = ListItemFoodListBinding.inflate(LayoutInflater.from(context), parent, false)
+        return VH(binding)
+    }
+
+    /**
+     * - 烹饪中：黑色文字、实线背景、显示"烹饪中"
+     * - 有累计重量：绿色文字、实线背景、显示累计统计
+     * - 空状态：灰色文字、虚线背景、隐藏统计行
+     */
+    override fun onBindViewHolder(holder: VH, position: Int, item: FoodRecord?) {
+        holder.binding.run {
+            val isCooking = item!!.isCooking
+            val totalWeight = item.totalWeight ?: 0.0
+            val foodWeight = item.foodWeight ?: 0.0
+
+            clBlock.setOnClickListener {
+                onItemClick?.invoke(holder.bindingAdapterPosition)
+            }
+
+            tvDishName.text = item.foodName
+            // 烹饪中
+            if (isCooking) {
+                tvDishName.setTextColor(ContextCompat.getColor(holder.itemView.context, R.color.black))
+                clBlock.setBackgroundResource(R.drawable.shape_white_fb_15_corners)
+                tvDishCount.visible()
+                tvDishCount.text = "制作统计：-kg"
+                tvShowState.text = "烹饪中"
+                return@run
+            }
+            // 非烹饪中，制作模式
+            if (mode == DisplayMode.COOKING_MODE) {
+                if (totalWeight > 0.0) {
+                    tvDishName.setTextColor(ContextCompat.getColor(holder.itemView.context, R.color.dish_green))
+                    clBlock.setBackgroundResource(R.drawable.shape_white_fb_15_corners)
+                    tvDishCount.visible()
+                    tvDishCount.text = "累计统计：${df.format(totalWeight / 1000.0F)}kg(${item.count}次)"
+                    tvShowState.text = "${df.format(foodWeight / 1000.0F)}kg"
+                } else {
+                    tvDishName.setTextColor(ContextCompat.getColor(holder.itemView.context, R.color.black999))
+                    clBlock.setBackgroundResource(R.drawable.shape_white_dash_15_corners)
+                    tvDishCount.gone()
+                    tvShowState.text = "-"
+                }
+                return@run
+            }
+            // 非烹饪中，采样模式
+            val realTotalWeight = if (totalWeight > 0.0) totalWeight else foodWeight
+            val showTotalWeight = if (realTotalWeight == 0.0) "-" else df.format(realTotalWeight / 1000.0F)
+            tvDishCount.text = "累计统计：${showTotalWeight}kg(${item.count ?: "-"}次)"
+            val showFoodWeight = if (foodWeight == 0.0) "-" else df.format(foodWeight / 1000.0F)
+            tvShowState.text = "${showFoodWeight}kg"
+        }
+    }
+
+    private val df = DecimalFormat("0.000")
+}

app/src/main/java/com/shuwei/dish/match/adapter/FoodMaterialAdapter.kt

@@ -0,0 +1,67 @@
+package com.shuwei.dish.match.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+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.ListItemFoodMaterialBinding
+import com.shuwei.dish.match.entity.GoodsItem
+import com.shuwei.dish.match.utils.ext.gone
+import com.shuwei.dish.match.utils.ext.roundedOneDecimalPlace
+import com.shuwei.dish.match.utils.ext.visible
+
+class FoodMaterialAdapter(list: MutableList<GoodsItem>) :
+    BaseQuickAdapter<GoodsItem, FoodMaterialAdapter.VH>(list) {
+
+    /** item 主体点击回调 */
+    var onItemClick: ((position: Int) -> Unit)? = null
+
+    inner class VH(var binding: ListItemFoodMaterialBinding) : QuickViewHolder(binding.root)
+
+    override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
+        val inflater = LayoutInflater.from(context)
+        val binding = ListItemFoodMaterialBinding.inflate(inflater, parent, false)
+        return VH(binding)
+    }
+
+    override fun onBindViewHolder(holder: VH, position: Int, item: GoodsItem?) {
+        holder.binding.run {
+            val data = item ?: return
+
+            clBlock.setOnClickListener {
+                onItemClick?.invoke(holder.bindingAdapterPosition)
+            }
+
+            tvDishName.text = data.goodsName
+            tvDishType.text = if (data.materialType == 1) "主辅材：主材" else if (data.materialType == 2) "主辅材：辅材" else ""
+            tvDishWeight.text =
+                if (data.useWeight == null || data.useWeight == 0.toDouble()) "" else "${data.useWeight!!.roundedOneDecimalPlace()}克"
+            tvDishWeight.setTextColor(
+                ContextCompat.getColor(
+                    context,
+                    if (data.isSamplingPage) R.color.black999 else R.color.dish_green
+                )
+            )
+
+            ivOperateIcon.run {
+                if (data.isSamplingPage) gone() else visible()
+            }
+            ivClearIcon.visible()
+            ivClearIcon.setImageResource(
+                if (data.isOriginalData) R.drawable.ic_dish_clear
+                else R.drawable.ic_delete
+            )
+            ivOperateIcon.setImageResource(
+                if (data.isSetFinished) R.drawable.ic_dish_selected
+                else R.drawable.ic_dish_unselected
+            )
+            clBlock.setBackgroundResource(
+                if (data.isItemClicked) R.drawable.shape_item_cook_dish
+                else R.drawable.shape_white_fb_15_corners
+            )
+        }
+    }
+}

app/src/main/java/com/shuwei/dish/match/adapter/GoodsInfoSearchAdapter.kt

@@ -1,49 +0,0 @@
-package com.shuwei.dish.match.adapter
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.core.content.ContextCompat
-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.ListItemSearchGoodsInfoBinding
-import com.shuwei.dish.match.entity.CookFoodGoodsEntity
-
-class GoodsInfoSearchAdapter(private var list: MutableList<CookFoodGoodsEntity>) :
-    BaseQuickAdapter<CookFoodGoodsEntity, GoodsInfoSearchAdapter.VH>(list) {
-
-    override fun onBindViewHolder(
-        holder: VH,
-        position: Int,
-        item: CookFoodGoodsEntity?
-    ) {
-        holder.binding.tvGoodsInfo.run {
-            text = item?.goodsName
-            setBackgroundResource(
-                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
-                    else R.color.black666
-                )
-            )
-        }
-    }
-
-    override fun onCreateViewHolder(
-        context: Context,
-        parent: ViewGroup,
-        viewType: Int
-    ): VH {
-        val binding =
-            ListItemSearchGoodsInfoBinding.inflate(LayoutInflater.from(context), parent, false)
-        return VH(binding)
-    }
-
-    inner class VH(var binding: ListItemSearchGoodsInfoBinding) : QuickViewHolder(binding.root)
-
-}

app/src/main/java/com/shuwei/dish/match/adapter/SamplingAdapter.kt

@@ -1,58 +0,0 @@
-package com.shuwei.dish.match.adapter
-
-import android.content.Context
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.core.content.ContextCompat
-import com.chad.library.adapter4.BaseQuickAdapter
-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.visible
-import java.text.DecimalFormat
-
-class SamplingAdapter(list: MutableList<FoodRecord>) :
-    BaseQuickAdapter<FoodRecord, SamplingAdapter.VH>(list) {
-
-    inner class VH(var binding: ListItemDishBinding) : QuickViewHolder(binding.root)
-
-    override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
-        val inflater = LayoutInflater.from(context)
-        val binding = ListItemDishBinding.inflate(inflater, parent, false)
-        return VH(binding)
-    }
-
-    override fun onBindViewHolder(holder: VH, position: Int, item: FoodRecord?) {
-        holder.binding.run {
-            val isCooking = item!!.isCooking
-            clBlock.setBackgroundResource(R.drawable.shape_white_fb_15_corners)
-            val totalWeight = item.totalWeight ?: 0.toDouble()
-            tvDishName.run {
-                text = (item.foodName?:"").ifBlank { "--" }
-                setTextColor(
-                    ContextCompat.getColor(
-                        holder.itemView.context,
-                        if (isCooking) R.color.black else R.color.dish_green
-                    )
-                )
-            }
-            tvDishCount.visible()
-            if (isCooking) {
-                tvDishCount.text = "制作统计：-kg"
-                tvShowState.text = "烹饪中"
-            } else {
-                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"
-            }
-        }
-    }
-
-    val df = DecimalFormat("0.000")
-}

app/src/main/java/com/shuwei/dish/match/adapter/ScaleRowAdapter.kt

@@ -0,0 +1,93 @@
+package com.shuwei.dish.match.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+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格子设备的秤列表展示
+ * 通过 updateItem / updateName / removeByAddress 同步更新，避免 submitList 的
+ * AsyncListDiffer 异步窗口期导致点击事件丢失
+ */
+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 = "")
+
+    /** item 点击回调 */
+    var onItemClick: ((ScaleItem) -> Unit)? = null
+
+    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}"
+        }
+        // 点击时通过 bindingAdapterPosition 取最新数据，避免闭包捕获过期 item
+        holder.b.root.setOnClickListener {
+            val pos = holder.bindingAdapterPosition
+            if (pos != RecyclerView.NO_POSITION) {
+                items.getOrNull(pos)?.let { onItemClick?.invoke(it) }
+            }
+        }
+    }
+
+    /**
+     * 同步更新单条秤数据：存在则定点刷新，不存在则按 address 升序插入
+     * 使用 set/add 替代 submitList，消除 AsyncListDiffer 异步窗口期
+     * @param item 最新秤数据
+     */
+    fun updateItem(item: ScaleItem) {
+        val idx = items.indexOfFirst { it.address == item.address }
+        if (idx >= 0) {
+            set(idx, item)
+        } else {
+            // 找到按 address 升序的插入位置
+            val insertPos = items.indexOfFirst { it.address > item.address }
+                .let { if (it < 0) items.size else it }
+            add(insertPos, item)
+        }
+    }
+
+    /**
+     * 同步更新指定地址的调料名称
+     * @param address 秤地址
+     * @param name    新名称
+     */
+    fun updateName(address: Int, name: String) {
+        val idx = items.indexOfFirst { it.address == address }
+        if (idx >= 0) set(idx, items[idx].copy(name = name))
+    }
+
+    /**
+     * 同步移除指定地址的条目
+     * @param address 秤地址
+     */
+    fun removeByAddress(address: Int) {
+        val idx = items.indexOfFirst { it.address == address }
+        if (idx >= 0) removeAt(idx)
+    }
+}

app/src/main/java/com/shuwei/dish/match/adapter/Seasoning18GridAdapter.kt

@@ -0,0 +1,174 @@
+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)
+            val black = ContextCompat.getColor(holder.b.root.context, R.color.black)
+            holder.b.tvAddress.setTextColor(sub)
+            holder.b.tvName.setTextColor(black)
+            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 -> ""
+    }
+}

app/src/main/java/com/shuwei/dish/match/adapter/Seasoning22GridAdapter.kt

@@ -0,0 +1,180 @@
+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)
+            val black = ContextCompat.getColor(holder.b.root.context, R.color.black)
+            holder.b.tvAddress.setTextColor(sub)
+            holder.b.tvName.setTextColor(black)
+            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 -> ""
+    }
+}

app/src/main/java/com/shuwei/dish/match/adapter/SeasoningSearchAdapter.kt

@@ -7,16 +7,19 @@ import androidx.core.content.ContextCompat
 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.ListItemSearchGoodsInfoBinding
+import com.shuwei.dish.match.databinding.ListItemFoodBinding
-import com.shuwei.dish.match.entity.SeasoningEntity
+import com.shuwei.dish.match.entity.GoodsItem
 
-class SeasoningSearchAdapter(private var list: MutableList<SeasoningEntity>) :
+/**
-    BaseQuickAdapter<SeasoningEntity, SeasoningSearchAdapter.VH>(list) {
+ * 调料搜索弹窗适配器
+ */
+class SeasoningSearchAdapter(private var list: MutableList<GoodsItem>) :
+    BaseQuickAdapter<GoodsItem, SeasoningSearchAdapter.VH>(list) {
 
     override fun onBindViewHolder(
         holder: VH,
         position: Int,
-        item: SeasoningEntity?
+        item: GoodsItem?
     ) {
         holder.binding.tvGoodsInfo.run {
             text = item?.goodsName
@@ -40,10 +43,10 @@ class SeasoningSearchAdapter(private var list: MutableList<SeasoningEntity>) :
         viewType: Int
     ): VH {
         val binding =
-            ListItemSearchGoodsInfoBinding.inflate(LayoutInflater.from(context), parent, false)
+            ListItemFoodBinding.inflate(LayoutInflater.from(context), parent, false)
         return VH(binding)
     }
 
-    inner class VH(var binding: ListItemSearchGoodsInfoBinding) : QuickViewHolder(binding.root)
+    inner class VH(var binding: ListItemFoodBinding) : QuickViewHolder(binding.root)
 
 }

app/src/main/java/com/shuwei/dish/match/adapter/SeasoningWeightAdapter.kt

@@ -0,0 +1,60 @@
+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
+import com.shuwei.dish.match.utils.ext.roundedDecimalPlace
+
+/**
+ * 调料使用重量列表 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
+        val showWeight = "${item.useWeight.roundedDecimalPlace(1)}g"
+        holder.binding.tvSeasoningWeight.text = showWeight
+    }
+
+    inner class VH(var binding: ItemSeasoningWeightBinding) : QuickViewHolder(binding.root)
+
+}

app/src/main/java/com/shuwei/dish/match/adapter/TextCellAdapter.kt

@@ -1,136 +1,136 @@
-package com.shuwei.dish.match.adapter
+//package com.shuwei.dish.match.adapter
-
+//
-import android.graphics.Typeface
+//import android.graphics.Typeface
-import android.icu.text.DecimalFormat
+//import android.icu.text.DecimalFormat
-import android.text.SpannableStringBuilder
+//import android.text.SpannableStringBuilder
-import android.text.style.AbsoluteSizeSpan
+//import android.text.style.AbsoluteSizeSpan
-import android.text.style.ForegroundColorSpan
+//import android.text.style.ForegroundColorSpan
-import android.text.style.LineHeightSpan
+//import android.text.style.LineHeightSpan
-import android.text.style.StyleSpan
+//import android.text.style.StyleSpan
-import android.view.LayoutInflater
+//import android.view.LayoutInflater
-import android.view.ViewGroup
+//import android.view.ViewGroup
-import android.widget.FrameLayout
+//import android.widget.FrameLayout
-import android.widget.TextView
+//import android.widget.TextView
-import androidx.core.content.ContextCompat
+//import androidx.core.content.ContextCompat
-import androidx.core.graphics.toColorInt
+//import androidx.core.graphics.toColorInt
-import androidx.recyclerview.widget.RecyclerView
+//import androidx.recyclerview.widget.RecyclerView
-import com.chad.library.adapter4.viewholder.QuickViewHolder
+//import com.chad.library.adapter4.viewholder.QuickViewHolder
-import com.shuwei.dish.match.R
+//import com.shuwei.dish.match.R
-import com.shuwei.dish.match.databinding.ListItemCellBinding
+//import com.shuwei.dish.match.databinding.ListItemCellBinding
-import com.shuwei.dish.match.entity.SeasoningEntity
+//import com.shuwei.dish.match.entity.SeasoningEntity
-import com.shuwei.dish.match.utils.ext.appendText
+//import com.shuwei.dish.match.utils.ext.appendText
-import com.shuwei.dish.match.utils.ext.buildSpannableString
+//import com.shuwei.dish.match.utils.ext.buildSpannableString
-import com.shuwei.dish.match.utils.ext.clickWithDebounce
+//import com.shuwei.dish.match.utils.ext.clickWithDebounce
-import com.shuwei.dish.match.utils.ext.dp
+//import com.shuwei.dish.match.utils.ext.dp
-import com.shuwei.dish.match.utils.ext.invisible
+//import com.shuwei.dish.match.utils.ext.invisible
-import com.shuwei.dish.match.utils.ext.roundedOneDecimalPlace
+//import com.shuwei.dish.match.utils.ext.roundedOneDecimalPlace
-import com.shuwei.dish.match.utils.ext.visible
+//import com.shuwei.dish.match.utils.ext.visible
-
+//
-class TextCellAdapter(var list: MutableList<SeasoningEntity>) :
+//class TextCellAdapter(var list: MutableList<SeasoningEntity>) :
-    RecyclerView.Adapter<TextCellAdapter.VH>() {
+//    RecyclerView.Adapter<TextCellAdapter.VH>() {
-
+//
-    inner class VH(var binding: ListItemCellBinding) : QuickViewHolder(binding.root)
+//    inner class VH(var binding: ListItemCellBinding) : QuickViewHolder(binding.root)
-
+//
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VH {
+//    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VH {
-        val inflater = LayoutInflater.from(parent.context)
+//        val inflater = LayoutInflater.from(parent.context)
-        val binding = ListItemCellBinding.inflate(inflater, parent, false)
+//        val binding = ListItemCellBinding.inflate(inflater, parent, false)
-        return VH(binding)
+//        return VH(binding)
-    }
+//    }
-
+//
-    override fun onBindViewHolder(holder: VH, position: Int) {
+//    override fun onBindViewHolder(holder: VH, position: Int) {
-        val item = list[position]
+//        val item = list[position]
-        holder.binding.run {
+//        holder.binding.run {
-            if (position == 10 || position == 11 || position == 13 || position == 14) {
+//            if (position == 10 || position == 11 || position == 13 || position == 14) {
-                root.invisible()
+//                root.invisible()
-            } else {
-                root.visible()
-            }
-            loadCell(tvCell, item)
-            //root.setBackgroundResource(R.color.dish_green)
-            (root.layoutParams as RecyclerView.LayoutParams).let {
-//                it.bottomMargin = 15.dp
-                it.width = 226.dp
-                it.height = 120.dp
-//                it.rightMargin = 0
-//                it.leftMargin = if (position % 3 == 0) 0 else 15.dp
-
-                it.leftMargin = 7.dp
-                it.rightMargin = 8.dp
-                it.topMargin = 7.dp
-                it.bottomMargin = 8.dp
-            }
-            if (item.pageType == 1) {
-                root.clickWithDebounce { onCellClick?.invoke(position) }
-            }
-        }
-    }
-
-    override fun getItemCount() = list.size
-
-    var onCellClick: ((positon: Int) -> Unit)? = null
-
-    companion object {
-        fun loadLayout(frameLayout: FrameLayout, item: SeasoningEntity) {
-            val child: TextView = frameLayout.getChildAt(0) as TextView
-            child.text = getTextSpan(item)
-        }
-        fun loadCell(tvCell: TextView, item: SeasoningEntity) {
-            tvCell.text = getTextSpan(item)
-        }
-//        fun loadCell2(tvCell: TextView, item: SeasoningEntity) {
-//            if (item.goodsName.isNullOrBlank()) {
-//                tvCell.run {
-//                    text = buildSpannableString {
-//                        appendText(
-//                            "未配置",
-//                            ForegroundColorSpan("#999999".toColorInt()),
-//                            StyleSpan(Typeface.BOLD),
-//                            AbsoluteSizeSpan(28, true),
-//                            LineHeightSpan { text, start, end, spanstartv, v, fm ->
-//                                fm.descent += 10.dp // 增加行间距
-//                            }
-//                        )}
-//                    //setTextColor(ContextCompat.getColor(context, R.color.black999))
-//                }
 //            } else {
-////                if (item.pageType == 1) {
+//                root.visible()
-////                    tvCell.run {
+//            }
-////                        text = item.goodsName
+//            loadCell(tvCell, item)
-////                        setTextColor(ContextCompat.getColor(context, R.color.black))
+//            //root.setBackgroundResource(R.color.dish_green)
-////                    }
+//            (root.layoutParams as RecyclerView.LayoutParams).let {
-////                } else {
+////                it.bottomMargin = 15.dp
-//                    tvCell.text = getTextSpan(item)
+//                it.width = 226.dp
-////                }
+//                it.height = 120.dp
+////                it.rightMargin = 0
+////                it.leftMargin = if (position % 3 == 0) 0 else 15.dp
+//
+//                it.leftMargin = 7.dp
+//                it.rightMargin = 8.dp
+//                it.topMargin = 7.dp
+//                it.bottomMargin = 8.dp
+//            }
+//            if (item.pageType == 1) {
+//                root.clickWithDebounce { onCellClick?.invoke(position) }
 //            }
 //        }
-
+//    }
-        fun getTextSpan(item: SeasoningEntity): SpannableStringBuilder {
+//
-            val endIndex = if (item.sort == 9) 10 else 6
+//    override fun getItemCount() = list.size
-            var name = if (item.goodsName.isNullOrBlank()) "未配置" else item.goodsName!!
+//
-            if (name.length > endIndex) {
+//    var onCellClick: ((positon: Int) -> Unit)? = null
-                name = "${name.substring(0, endIndex)}…"
+//
-            }
+//    companion object {
-            return buildSpannableString {
+//        fun loadLayout(frameLayout: FrameLayout, item: SeasoningEntity) {
-                appendText(
+//            val child: TextView = frameLayout.getChildAt(0) as TextView
-                    name,
+//            child.text = getTextSpan(item)
-                    ForegroundColorSpan(if (item.goodsName.isNullOrBlank()) "#999999".toColorInt() else "#000000".toColorInt()),
+//        }
-                    StyleSpan(Typeface.BOLD),
+//        fun loadCell(tvCell: TextView, item: SeasoningEntity) {
-                    AbsoluteSizeSpan(28, true),
+//            tvCell.text = getTextSpan(item)
-                    LineHeightSpan { text, start, end, spanstartv, v, fm ->
+//        }
-                        fm.descent += 10.dp // 增加行间距
+////        fun loadCell2(tvCell: TextView, item: SeasoningEntity) {
-                    }
+////            if (item.goodsName.isNullOrBlank()) {
-                )
+////                tvCell.run {
-                append("\n")
+////                    text = buildSpannableString {
-                val weight = item.useWeight ?: 0.toDouble()
+////                        appendText(
-                val weightColor = if (weight == 0.toDouble()) "#999999" else "#00BC71"
+////                            "未配置",
-                appendText(
+////                            ForegroundColorSpan("#999999".toColorInt()),
-//                    "${DecimalFormat("#").format(weight)}g",
+////                            StyleSpan(Typeface.BOLD),
-                    "${weight.roundedOneDecimalPlace()}g",
+////                            AbsoluteSizeSpan(28, true),
-                    ForegroundColorSpan(weightColor.toColorInt()),
+////                            LineHeightSpan { text, start, end, spanstartv, v, fm ->
-                    AbsoluteSizeSpan(30, true)
+////                                fm.descent += 10.dp // 增加行间距
-                )
+////                            }
-            }
+////                        )}
-        }
+////                    //setTextColor(ContextCompat.getColor(context, R.color.black999))
-    }
+////                }
-
+////            } else {
-}
+//////                if (item.pageType == 1) {
+//////                    tvCell.run {
+//////                        text = item.goodsName
+//////                        setTextColor(ContextCompat.getColor(context, R.color.black))
+//////                    }
+//////                } else {
+////                    tvCell.text = getTextSpan(item)
+//////                }
+////            }
+////        }
+//
+//        fun getTextSpan(item: SeasoningEntity): SpannableStringBuilder {
+//            val endIndex = if (item.sort == 9) 10 else 6
+//            var name = if (item.goodsName.isNullOrBlank()) "未配置" else item.goodsName!!
+//            if (name.length > endIndex) {
+//                name = "${name.substring(0, endIndex)}…"
+//            }
+//            return buildSpannableString {
+//                appendText(
+//                    name,
+//                    ForegroundColorSpan(if (item.goodsName.isNullOrBlank()) "#999999".toColorInt() else "#000000".toColorInt()),
+//                    StyleSpan(Typeface.BOLD),
+//                    AbsoluteSizeSpan(28, true),
+//                    LineHeightSpan { text, start, end, spanstartv, v, fm ->
+//                        fm.descent += 10.dp // 增加行间距
+//                    }
+//                )
+//                append("\n")
+//                val weight = item.useWeight ?: 0.toDouble()
+//                val weightColor = if (weight == 0.toDouble()) "#999999" else "#00BC71"
+//                appendText(
+////                    "${DecimalFormat("#").format(weight)}g",
+//                    "${weight.roundedOneDecimalPlace()}g",
+//                    ForegroundColorSpan(weightColor.toColorInt()),
+//                    AbsoluteSizeSpan(30, true)
+//                )
+//            }
+//        }
+//    }
+//
+//}

app/src/main/java/com/shuwei/dish/match/adapter/VectorCollectionAdapter.kt

@@ -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.ListItemVectorCollectionBinding
+import com.shuwei.dish.match.entity.FoodCollectionBean
+import com.shuwei.dish.match.utils.ext.load
+
+class VectorCollectionAdapter (var list: MutableList<FoodCollectionBean>) :
+    BaseQuickAdapter<FoodCollectionBean, VectorCollectionAdapter.VH>(list) {
+
+    inner class VH(var binding: ListItemVectorCollectionBinding) : QuickViewHolder(binding.root)
+
+    override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
+        val inflater = LayoutInflater.from(context)
+        val binding = ListItemVectorCollectionBinding.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
+//                        )
+//                    }
+                }
+            }
+        }
+    }
+
+}

app/src/main/java/com/shuwei/dish/match/base/BaseActivity.kt

@@ -1,6 +1,7 @@
 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
@@ -8,20 +9,21 @@ import android.view.View
 import android.widget.FrameLayout
 import android.widget.ImageView
 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.entity.CookFoodGoodsEntity
-import com.shuwei.dish.match.entity.SeasoningEntity
 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.visible
@@ -31,72 +33,54 @@ import java.time.format.DateTimeFormatter
 import java.util.Locale
 import kotlin.getValue
 
-@Suppress("DEPRECATION")
 open class BaseActivity : AppCompatActivity() {
 
+    companion object {
+        /** 日期时间格式化器，复用避免每秒重复创建 */
+        private val DATE_FORMATTER =
+            DateTimeFormatter.ofPattern("yyyy年MM月dd日 EEEE***HH:mm:ss", Locale.CHINA)
+    }
+
     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 =
+        // 主设备垂直 padding 30dp，子设备 15dp
-            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+        val verticalPadding = if (GlobalData.deviceRole == DeviceRole.MASTER) 30.dp else 10.dp
-                if (result.resultCode == RESULT_OK) {
+        binding.tvLeftTime.setPadding(0, verticalPadding, 0, verticalPadding)
-                    launchCallback?.invoke(result.data)
+        binding.tvRightTime.setPadding(0, verticalPadding, 0, verticalPadding)
-                }
-            }
-
-//        window.setDecorFitsSystemWindows(false) // 启用 Edge-to-Edge
-//        window.insetsController?.apply {
-//            hide(WindowInsets.Type.statusBars()) // 隐藏状态栏
-//            systemBarsBehavior =
-//                WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE // 滑动时临时显示
-//        }
         binding.llTitleBar.gone()
         binding.ivBack.setOnClickListener { finish() }
     }
 
-    private var bgState = true
-    fun useBackground(enable: Boolean) {
-        bgState = enable
-    }
-
     override fun onDestroy() {
+        handler.removeCallbacksAndMessages(null)
         dismissLoading()
         super.onDestroy()
         ActivityManager.removeActivity(this)
     }
 
     fun hideStatusBar() {
-        enableEdgeToEdge()
+        hideSystemBars()
-//        val uiOptions = (View.SYSTEM_UI_FLAG_FULLSCREEN // 隐藏状态栏
-//                or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) // 隐藏导航栏（可选）
-        window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_FULLSCREEN
     }
 
     fun statusBarDarkFont(enable: Boolean) {
-        //window.decorView.systemUiVisibility = if (enable) View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR else 0
         val color = ContextCompat.getColor(
-            this,
+            this, if (enable) R.color.black else R.color.white
-            if (enable) R.color.black else R.color.white
         )
         binding.tvLeftTime.setTextColor(color)
         binding.tvRightTime.setTextColor(color)
@@ -108,6 +92,7 @@ open class BaseActivity : AppCompatActivity() {
         titleAction: ((TextView) -> Unit)? = null,
         rightIconActon: ((ImageView) -> Unit)? = null
     ) {
+        binding.llTitleBar.visible()
         titleBarAction?.invoke(binding.llTitleBar)
         backAction?.invoke(binding.ivBack)
         titleAction?.invoke(binding.tvTitle)
@@ -120,12 +105,15 @@ open class BaseActivity : AppCompatActivity() {
         }
     }
 
-    public fun setHeaderBackground(isHomePage: Boolean = false) {
+    fun setHeaderBackground(isHomePage: Boolean = false) {
         binding.ivHeaderBg.setImageResource(
             if (isHomePage) R.drawable.bg_home_page else R.drawable.bg_other_page
         )
     }
 
+    /** 返回 Fragment 容器的 View ID，供子类加载 Fragment 使用 */
+    protected fun getFragmentContainerId(): Int = R.id.flContainer
+
     override fun setContentView(view: View?) {
         if (view == binding.root) {
             super.setContentView(view)
@@ -135,8 +123,7 @@ open class BaseActivity : AppCompatActivity() {
     }
 
     private fun updateDateTime() {
-        val formatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日 EEEE***HH:mm:ss", Locale.CHINA)
+        val dateTime = DATE_FORMATTER.format(LocalDateTime.now(ZoneId.of("Asia/Shanghai")))
-        val dateTime = formatter.format(LocalDateTime.now(ZoneId.of("Asia/Shanghai")))
         val arr = dateTime.split("***")
         binding.tvRightTime.text = arr[0]
         binding.tvLeftTime.text = arr[1]
@@ -161,36 +148,120 @@ open class BaseActivity : AppCompatActivity() {
         handler.removeCallbacks(updateTask)
     }
 
-    fun showLoading() {
+    fun showLoading(msg: String = "加载中……") {
-        Loading.show(this)
+        handler.post {
+            Loading.show(
+                context = this,
+                message = msg
+            )
+        }
     }
 
     fun dismissLoading() {
-        Loading.dismiss()
+        handler.post {
+            Loading.dismiss()
+        }
     }
 
     fun delayDismissLoading() {
-        window.decorView.postDelayed({
+        handler.postDelayed({
             Loading.dismiss()
         }, 500)
     }
 
-
+    /**
-    val netViewModel: NetViewModel by viewModels()
+     * 在主线程延迟执行任务，供子类使用
-    fun queryGoodsList(
+     * @param delayMs 延迟毫秒数
-        param: MutableMap<String, Any>,
+     * @param block 待执行的任务
-        onSuccess: (MutableList<CookFoodGoodsEntity>?) -> Unit,
+     */
-        onFailure: (String, String) -> Unit
+    protected fun postDelayed(delayMs: Long, block: () -> Unit) {
-    ) {
+        handler.postDelayed(block, delayMs)
-        netViewModel.queryGoodsList(param, onSuccess, onFailure)
     }
 
-    fun querySeasoningList(
+
-        param: MutableMap<String, Any>,
+    val netViewModel: NetViewModel by viewModels()
-        onSuccess: (MutableList<SeasoningEntity>?) -> Unit,
+    val appViewModel: DbViewModel by viewModels()
-        onFailure: (String, String) -> Unit
+
+    private var singlePermissionCallback: ((isGranted: Boolean) -> Unit)? = null
+    private var multiplePermissionsCallback: ((isGranted: Boolean) -> Unit)? = null
+    private var activityCallback: ((intent: Intent?) -> Unit)? = null
+
+    fun requestMultiplePermissions(
+        permissions: Array<String>,
+        callback: (isGranted: Boolean) -> Unit
     ) {
-        netViewModel.querySeasoningList(param, onSuccess, onFailure)
+        this.multiplePermissionsCallback = callback
+        requestMultiplePermissionsLauncher.launch(permissions)
+    }
+
+    fun requestPermission(permission: String, callback: (isGranted: Boolean) -> Unit) {
+        this.singlePermissionCallback = callback
+        requestPermissionLauncher.launch(permission)
+    }
+
+    private val requestMultiplePermissionsLauncher = registerForActivityResult(
+        ActivityResultContracts.RequestMultiplePermissions()
+    ) { permissions ->
+        var isGranted = true
+        permissions.entries.forEach {
+            if (!it.value) {
+                isGranted = false
+            }
+        }
+        multiplePermissionsCallback?.invoke(isGranted)
+    }
+
+    // 权限请求回调
+    private val requestPermissionLauncher = registerForActivityResult(
+        ActivityResultContracts.RequestPermission()
+    ) { isGranted ->
+        singlePermissionCallback?.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
+        }
     }
 
 }

app/src/main/java/com/shuwei/dish/match/base/BaseApp.kt

@@ -8,29 +8,58 @@ 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.ui.InitActivity.Companion.TAG
+import com.shuwei.dish.match.objbox.ObjectBox
+import com.shuwei.dish.match.scale.ScaleDeviceConfig
+import com.shuwei.dish.match.scale.ScaleServiceManager
 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
 
 
+/**
+ * BaseApp is the main application class that extends Android's Application class.
+ * It handles initialization of core components, device role determination,
+ * and service management for the weighing system.
+ */
 class BaseApp : Application() {
 
+    // Lazy initialization of the database instance
     val database by lazy { DatabaseProvider(this).instance }
 
     override fun onCreate() {
         super.onCreate()
+        // Set the application instance
         instance = this
+        // Initialize crash handler for error tracking
+        CrashHandler.init(this)
+        // Get and store the unique device ID
         val deviceId = AppUtil.getUDID(this)
         Log.d(TAG, "onCreate: deviceId=$deviceId")
         GlobalData.deviceId = deviceId
+
+        // 根据设备 ID 判断角色：指定 ID 为主设备，其余为子设备
+        // 主设备是/dev/ttyS7，子设备是/dev/ttyS4
+        if (deviceId == ScaleDeviceConfig.DEVICE_ID_2) {
+            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 {
-
+        private val TAG = "BaseApp"
-//        const val canteenId = "1678234139391512577"
+        //        const val canteenId = "1678234139391512577"
         var canteenId = "0"
 //        var configUrl = ""
 

app/src/main/java/com/shuwei/dish/match/base/BaseFragment.kt

@@ -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()
+    }
+
 }

app/src/main/java/com/shuwei/dish/match/base/BaseReq.kt

@@ -1,10 +0,0 @@
-package com.shuwei.dish.match.base
-
-class BaseReq<T> {
-    var code: Int? = null
-    var success: Boolean? = null
-    var data: T? = null
-    var message: String? = null
-    var result: T? = null
-    var msg: String? = null
-}

app/src/main/java/com/shuwei/dish/match/base/GlobalData.kt

@@ -1,12 +1,30 @@
 package com.shuwei.dish.match.base
 
-object GlobalData {
+/**
-    var appBaseUrl: String = "https://dev.yixiong-tech.com:8081"
+ * 设备角色枚举
+ * 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"
 }

app/src/main/java/com/shuwei/dish/match/db/AppDatabase.kt

@@ -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 = 10,
     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 {
 
@@ -192,6 +214,24 @@ val MIGRATION_6_7 = MigrationImpl(6, 7) {db ->
     }
 }
 
+/**
+ * 版本8→9：为 dm_cook_food_goods 和 dm_seasoning 表新增 zjmCode、materId 字段
+ */
+val MIGRATION_8_9 = MigrationImpl(8, 9) { db ->
+    db.execSQL("ALTER TABLE dm_cook_food_goods ADD COLUMN zjmCode TEXT DEFAULT ''")
+    db.execSQL("ALTER TABLE dm_cook_food_goods ADD COLUMN materId TEXT DEFAULT ''")
+    db.execSQL("ALTER TABLE dm_seasoning ADD COLUMN zjmCode TEXT DEFAULT ''")
+    db.execSQL("ALTER TABLE dm_seasoning ADD COLUMN materId TEXT DEFAULT ''")
+}
+
+/**
+ * 版本9→10：删除 dm_cook_food 表 foodId 唯一索引
+ * 改为由应用层保证同一 foodId 且 isDel=0 只有一条记录，以支持逻辑删除
+ */
+val MIGRATION_9_10 = MigrationImpl(9, 10) { db ->
+    db.execSQL("DROP INDEX IF EXISTS dm_cook_food_foodId_IDX")
+}
+
 class DatabaseProvider(private val context: Context) {
     // 单例模式确保全局唯一实例‌
     val instance: AppDatabase by lazy {
@@ -210,6 +250,9 @@ class DatabaseProvider(private val context: Context) {
 //            .addMigrations(MIGRATION_4_5)
 //            .addMigrations(MIGRATION_5_6)
 //            .addMigrations(MIGRATION_6_7)
+            .addMigrations(MIGRATION_7_8)
+            .addMigrations(MIGRATION_8_9)
+            .addMigrations(MIGRATION_9_10)
             .build()
     }
 }

app/src/main/java/com/shuwei/dish/match/db/DatabaseRepository.kt

@@ -1,142 +0,0 @@
-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 kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-
-
-class AppRepository(val appDao: AppDao) {
-
-    suspend fun insertCookFood(item: CookFoodEntity) = withContext(Dispatchers.IO) {
-        appDao.insertCookFood(item)
-    }
-
-    suspend fun updateCookFood(item: CookFoodEntity) = withContext(Dispatchers.IO) {
-        appDao.updateCookFood(item)
-    }
-
-    suspend fun getCookFoodById(foodId: String, cookMode: Int) = withContext(Dispatchers.IO) {
-        appDao.getCookFoodById(BaseApp.canteenId, foodId, cookMode)
-    }
-
-    suspend fun getCookFoodList(cookMode: Int, dinnerType: String) = withContext(Dispatchers.IO) {
-        appDao.getCookFoodList(BaseApp.canteenId, cookMode, dinnerType)
-    }
-
-    suspend fun countCookFood(cookMode: Int) = withContext(Dispatchers.IO) {
-        appDao.countCookFood(BaseApp.canteenId, cookMode)
-    }
-
-    suspend fun deleteCookFood(foodId: String, cookMode: Int) = withContext(Dispatchers.IO) {
-        appDao.deleteCookFood(BaseApp.canteenId, foodId, cookMode)
-    }
-
-    suspend fun deleteCookFoodGoodsList(pid:Long, foodId: String) = withContext(Dispatchers.IO) {
-        appDao.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)
-        }
-
-//    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)
-    }
-
-    suspend fun getCookFoodGoodsListByType(
-        foodId: String,
-        materialType: Int
-    ) = withContext(Dispatchers.IO) {
-        appDao.getCookFoodGoodsListByType(foodId, materialType)
-    }
-    //--------------------------------------------------------------------------------------------
-
-    suspend fun getSeasoningById(id: Long) = withContext(Dispatchers.IO) {
-        appDao.getSeasoningById(id)
-    }
-
-    suspend fun getSeasoningBySort(sort:Int) = withContext(Dispatchers.IO) {
-        appDao.getSeasoningBySort(sort)
-    }
-
-    suspend fun getSeasoningByGoodsId(goodsId: Int) = withContext(Dispatchers.IO) {
-        appDao.getSeasoningByGoodsId(goodsId)
-    }
-
-    suspend fun getAllStream() = withContext(Dispatchers.IO) {
-        appDao.getAllStream()
-    }
-
-    suspend fun search(query: String) = withContext(Dispatchers.IO) {
-        appDao.search(query)
-    }
-
-    suspend fun clearAllSeasoning() = withContext(Dispatchers.IO) {
-        appDao.clearAllSeasoning()
-    }
-
-    suspend fun deleteSeasoningBySort(sort: Int) = withContext(Dispatchers.IO) {
-        appDao.deleteSeasoningBySort(sort)
-    }
-
-    suspend fun insertSeasoningList(items: MutableList<SeasoningEntity>) =
-        withContext(Dispatchers.IO) {
-            appDao.insertSeasoningList(items)
-        }
-
-    suspend fun updateSeasoning(item: SeasoningEntity) = withContext(Dispatchers.IO) {
-        appDao.updateSeasoning(item)
-    }
-
-    suspend fun insertSeasoning(item: SeasoningEntity) = withContext(Dispatchers.IO) {
-        appDao.insertSeasoning(item)
-    }
-}
-//
-//class SeasoningRepository(val seasoningDao: SeasoningDao) {
-//    val seasoningList: Flow<List<SeasoningEntity>> = seasoningDao.getAllStream()
-//
-//     fun addSeasoning(item: SeasoningEntity) = withContext(Dispatchers.IO) {
-//        seasoningDao.insert(item)
-//    }
-//
-//     fun searchSeasoning(query: String) = withContext(Dispatchers.IO) {
-//        seasoningDao.search(query)
-//    }
-//}
-//
-//class CookFoodRepository(val cookFoodDao: CookFoodDao) {
-//     fun getCookFood(foodId: String, cookMode:Int = 0) = withContext(Dispatchers.IO) {
-//        cookFoodDao.getCookFoodById(foodId, cookMode)
-//    }
-//
-//     fun getCookFoodByList(cookMode:Int = 0) = withContext(Dispatchers.IO) {
-//        cookFoodDao.getCookFoodList(cookMode)
-//    }
-//
-//     fun countCookFood(cookMode:Int = 0)= withContext(Dispatchers.IO) {
-//        cookFoodDao.countCookFood(cookMode)
-//    }
-//}
-//
-//class CookFoodGoodsRepository(val cookFoodGoodsDao: CookFoodGoodsDao) {
-//     fun getFoodGoodsList(foodId: String) = withContext(Dispatchers.IO) {
-//        cookFoodGoodsDao.getCookFoodGoodsList(foodId)
-//    }
-//
-//}
-

app/src/main/java/com/shuwei/dish/match/db/DbRepository.kt

@@ -0,0 +1,259 @@
+package com.shuwei.dish.match.db
+
+import com.shuwei.dish.match.base.BaseApp
+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 DbRepository {
+
+    private val db = BaseApp.instance!!.database
+
+    suspend fun insertCookFood(item: CookFoodEntity) = withContext(Dispatchers.IO) {
+        db.cookFoodDao().insertCookFood(item)
+    }
+
+    suspend fun updateCookFood(item: CookFoodEntity) = withContext(Dispatchers.IO) {
+        db.cookFoodDao().updateCookFood(item)
+    }
+
+    suspend fun getCookFoodById(foodId: String, cookMode: Int) = withContext(Dispatchers.IO) {
+        db.cookFoodDao().getCookFoodById(BaseApp.canteenId, foodId, cookMode)
+    }
+
+    suspend fun getCookFoodList(cookMode: Int, dinnerType: String) = withContext(Dispatchers.IO) {
+        db.cookFoodDao().getCookFoodList(BaseApp.canteenId, cookMode, dinnerType)
+    }
+
+    suspend fun countCookFood(cookMode: Int) = withContext(Dispatchers.IO) {
+        db.cookFoodDao().countCookFood(BaseApp.canteenId, cookMode)
+    }
+
+    suspend fun deleteCookFood(foodId: String, cookMode: Int) = withContext(Dispatchers.IO) {
+        db.cookFoodDao().deleteCookFood(BaseApp.canteenId, foodId, cookMode)
+    }
+
+    suspend fun deleteCookFoodGoodsList(pid: Long, foodId: String) = withContext(Dispatchers.IO) {
+        db.cookFoodGoodsDao().deleteCookFoodGoodsList(pid, foodId)
+    }
+    //--------------------------------------------------------------------------------------------
+
+    suspend fun insertGoodsList(items: MutableList<CookFoodGoodsEntity>) =
+        withContext(Dispatchers.IO) {
+            db.cookFoodGoodsDao().insertGoodsList(items)
+        }
+
+    suspend fun getCookFoodGoodsList(pid: Long, foodId: String) = withContext(Dispatchers.IO) {
+        db.cookFoodGoodsDao().getCookFoodGoodsList(pid, foodId)
+    }
+
+    suspend fun getCookFoodGoodsListByType(
+        foodId: String,
+        materialType: Int
+    ) = withContext(Dispatchers.IO) {
+        db.cookFoodGoodsDao().getCookFoodGoodsListByType(foodId, materialType)
+    }
+    //--------------------------------------------------------------------------------------------
+
+    suspend fun getSeasoningById(id: Long) = withContext(Dispatchers.IO) {
+        db.seasoningDao().getSeasoningById(id)
+    }
+
+    suspend fun getSeasoningBySort(sort: Int) = withContext(Dispatchers.IO) {
+        db.seasoningDao().getSeasoningBySort(sort)
+    }
+
+    suspend fun getSeasoningByGoodsId(goodsId: String) = withContext(Dispatchers.IO) {
+        db.seasoningDao().getSeasoningByGoodsId(goodsId)
+    }
+
+    suspend fun getAllStream() = withContext(Dispatchers.IO) {
+        db.seasoningDao().getAllStream()
+    }
+
+    suspend fun search(query: String) = withContext(Dispatchers.IO) {
+        db.seasoningDao().search(query)
+    }
+
+    suspend fun clearAllSeasoning() = withContext(Dispatchers.IO) {
+        db.seasoningDao().clearAllSeasoning()
+    }
+
+    suspend fun deleteSeasoningBySort(sort: Int) = withContext(Dispatchers.IO) {
+        db.seasoningDao().deleteSeasoningBySort(sort)
+    }
+
+    suspend fun insertSeasoningList(items: MutableList<SeasoningEntity>) =
+        withContext(Dispatchers.IO) {
+            db.seasoningDao().insertSeasoningList(items)
+        }
+
+    suspend fun updateSeasoning(item: SeasoningEntity) = withContext(Dispatchers.IO) {
+        db.seasoningDao().updateSeasoning(item)
+    }
+
+    suspend fun insertSeasoning(item: SeasoningEntity) = withContext(Dispatchers.IO) {
+        db.seasoningDao().insertSeasoning(item)
+    }
+
+    /**
+     * 按 goodsId 查重后 upsert：存在则更新，不存在则插入
+     * 确保同一个 goodsId 在 dm_seasoning 中只有一条记录
+     */
+    suspend fun upsertSeasoningByGoodsId(item: SeasoningEntity) = withContext(Dispatchers.IO) {
+        val existing = db.seasoningDao().getSeasoningByGoodsId(item.goodsId)
+        if (existing != null) {
+            db.seasoningDao().updateSeasoning(item.also { it.id = existing.id })
+        } else {
+            item.id = 0
+            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)
+    }
+
+    // ---- 调试用：查询各表全量数据（含已删除记录）----
+
+    /** 查询 dm_cook_food 全部记录 */
+    suspend fun getAllCookFood() = withContext(Dispatchers.IO) {
+        db.cookFoodDao().getAllCookFood()
+    }
+
+    /** 查询 dm_cook_food_goods 全部记录 */
+    suspend fun getAllCookFoodGoods() = withContext(Dispatchers.IO) {
+        db.cookFoodGoodsDao().getAllCookFoodGoods()
+    }
+
+    /** 查询 dm_seasoning 全部记录 */
+    suspend fun getAllSeasoning() = withContext(Dispatchers.IO) {
+        db.seasoningDao().getAllSeasoning()
+    }
+
+    // ---- 调试用：分页查询（含 isDel 过滤）----
+
+    suspend fun getCookFoodPaged(showDel: Boolean, limit: Int, offset: Int) =
+        withContext(Dispatchers.IO) {
+            db.cookFoodDao().getCookFoodPaged(if (showDel) 1 else 0, limit, offset)
+        }
+
+    suspend fun countCookFoodAll(showDel: Boolean) = withContext(Dispatchers.IO) {
+        db.cookFoodDao().countCookFoodAll(if (showDel) 1 else 0)
+    }
+
+    suspend fun getCookFoodGoodsPaged(showDel: Boolean, limit: Int, offset: Int) =
+        withContext(Dispatchers.IO) {
+            db.cookFoodGoodsDao().getCookFoodGoodsPaged(if (showDel) 1 else 0, limit, offset)
+        }
+
+    suspend fun countCookFoodGoodsAll(showDel: Boolean) = withContext(Dispatchers.IO) {
+        db.cookFoodGoodsDao().countCookFoodGoodsAll(if (showDel) 1 else 0)
+    }
+
+    suspend fun getSeasoningPaged(showDel: Boolean, limit: Int, offset: Int) =
+        withContext(Dispatchers.IO) {
+            db.seasoningDao().getSeasoningPaged(if (showDel) 1 else 0, limit, offset)
+        }
+
+    suspend fun countSeasoningAll(showDel: Boolean) = withContext(Dispatchers.IO) {
+        db.seasoningDao().countSeasoningAll(if (showDel) 1 else 0)
+    }
+
+    suspend fun getSlotPaged(limit: Int, offset: Int) = withContext(Dispatchers.IO) {
+        db.seasoningSlotDao().getSlotPaged(limit, offset)
+    }
+
+    suspend fun countSlotAll() = withContext(Dispatchers.IO) {
+        db.seasoningSlotDao().countSlotAll()
+    }
+}
+//
+//class SeasoningRepository(val seasoningDao: SeasoningDao) {
+//    val seasoningList: Flow<List<SeasoningEntity>> = seasoningDao.getAllStream()
+//
+//     fun addSeasoning(item: SeasoningEntity) = withContext(Dispatchers.IO) {
+//        seasoningDao.insert(item)
+//    }
+//
+//     fun searchSeasoning(query: String) = withContext(Dispatchers.IO) {
+//        seasoningDao.search(query)
+//    }
+//}
+//
+//class CookFoodRepository(val cookFoodDao: CookFoodDao) {
+//     fun getCookFood(foodId: String, cookMode:Int = 0) = withContext(Dispatchers.IO) {
+//        cookFoodDao.getCookFoodById(foodId, cookMode)
+//    }
+//
+//     fun getCookFoodByList(cookMode:Int = 0) = withContext(Dispatchers.IO) {
+//        cookFoodDao.getCookFoodList(cookMode)
+//    }
+//
+//     fun countCookFood(cookMode:Int = 0)= withContext(Dispatchers.IO) {
+//        cookFoodDao.countCookFood(cookMode)
+//    }
+//}
+//
+//class CookFoodGoodsRepository(val cookFoodGoodsDao: CookFoodGoodsDao) {
+//     fun getFoodGoodsList(foodId: String) = withContext(Dispatchers.IO) {
+//        cookFoodGoodsDao.getCookFoodGoodsList(foodId)
+//    }
+//
+//}
+

app/src/main/java/com/shuwei/dish/match/db/DbViewModel.kt

@@ -0,0 +1,451 @@
+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)
+
+    // ---- 数据库调试查看 ----
+
+    companion object {
+        /** 每页加载条数 */
+        const val DB_INSPECT_PAGE_SIZE = 50
+    }
+
+    /**
+     * 数据库调试页面 UI 状态
+     * @param items 当前已加载的记录列表，Pair.first=是否逻辑删除，Pair.second=格式化文本
+     * @param totalCount 当前过滤条件下的总记录数
+     * @param hasMore 是否还有更多数据可加载
+     * @param isLoading 是否正在加载（首次加载或加载更多）
+     */
+    data class DbInspectUiState(
+        val items: List<Pair<Boolean, String>> = emptyList(),
+        val totalCount: Int = 0,
+        val hasMore: Boolean = false,
+        val isLoading: Boolean = false
+    )
+
+    private val _dbInspectState = MutableStateFlow(DbInspectUiState())
+    val dbInspectState: StateFlow<DbInspectUiState> = _dbInspectState.asStateFlow()
+
+    /**
+     * 加载指定表的第一页数据（切换 Tab / 切换 isDel 过滤时调用）
+     * @param tableIndex 0=菜品 1=食材 2=调料 3=槽位
+     * @param showDel true=包含已删除记录，false=只看有效记录
+     */
+    fun loadDbInspect(tableIndex: Int, showDel: Boolean) {
+        viewModelScope.launch {
+            // 立即清空旧数据并显示加载状态，避免切换 Tab 时旧数据闪现
+            _dbInspectState.value = DbInspectUiState(isLoading = true)
+            val (items, total) = queryPage(tableIndex, showDel, offset = 0)
+            _dbInspectState.value = DbInspectUiState(
+                items = items,
+                totalCount = total,
+                hasMore = items.size < total,
+                isLoading = false
+            )
+        }
+    }
+
+    /**
+     * 追加加载下一页数据（点击"加载更多"时调用）
+     * @param tableIndex 0=菜品 1=食材 2=调料 3=槽位
+     * @param showDel true=包含已删除记录
+     */
+    fun loadMoreDbInspect(tableIndex: Int, showDel: Boolean) {
+        viewModelScope.launch {
+            val current = _dbInspectState.value
+            // 已在加载中或无更多数据时直接返回，防止重复请求
+            if (!current.hasMore || current.isLoading) return@launch
+            _dbInspectState.value = current.copy(isLoading = true)
+            val (newItems, total) = queryPage(tableIndex, showDel, offset = current.items.size)
+            val merged = current.items + newItems
+            _dbInspectState.value = DbInspectUiState(
+                items = merged,
+                totalCount = total,
+                hasMore = merged.size < total,
+                isLoading = false
+            )
+        }
+    }
+
+    /**
+     * 执行分页查询，返回格式化后的列表和总记录数
+     */
+    private suspend fun queryPage(
+        tableIndex: Int,
+        showDel: Boolean,
+        offset: Int
+    ): Pair<List<Pair<Boolean, String>>, Int> {
+        val limit = DB_INSPECT_PAGE_SIZE
+        return when (tableIndex) {
+            0 -> {
+                val total = rep.countCookFoodAll(showDel)
+                val rows = rep.getCookFoodPaged(showDel, limit, offset).map { e ->
+                    (e.isDel == 1) to fmt(
+                        "id" to e.id, "foodId" to e.foodId, "foodName" to e.foodName,
+                        "canteenId" to e.canteenId, "foodWeight" to e.foodWeight, "cookMode" to e.cookMode,
+                        "dinnerType" to e.dinnerType, "isDel" to e.isDel, "createTime" to e.createTime
+                    )
+                }
+                rows to total
+            }
+            1 -> {
+                val total = rep.countCookFoodGoodsAll(showDel)
+                val rows = rep.getCookFoodGoodsPaged(showDel, limit, offset).map { e ->
+                    (e.isDel == 1) to fmt(
+                        "id" to e.id, "pid" to e.pid, "goodsId" to e.goodsId,
+                        "goodsName" to e.goodsName, "foodId" to e.foodId, "materialType" to e.materialType,
+                        "relateionType" to e.relateionType, "allEdible" to e.allEdible, "useWeight" to e.useWeight,
+                        "sort" to e.sort, "zjmCode" to e.zjmCode, "materId" to e.materId,
+                        "isDel" to e.isDel, "createTime" to e.createTime
+                    )
+                }
+                rows to total
+            }
+            2 -> {
+                val total = rep.countSeasoningAll(showDel)
+                val rows = rep.getSeasoningPaged(showDel, limit, offset).map { e ->
+                    (e.isDel == 1) to fmt(
+                        "id" to e.id, "goodsId" to e.goodsId, "goodsName" to e.goodsName,
+                        "sort" to e.sort, "materialType" to e.materialType, "useWeight" to e.useWeight,
+                        "zjmCode" to e.zjmCode, "materId" to e.materId, "isDel" to e.isDel,
+                        "createTime" to e.createTime
+                    )
+                }
+                rows to total
+            }
+            3 -> {
+                val total = rep.countSlotAll()
+                val rows = rep.getSlotPaged(limit, offset).map { e ->
+                    false to "deviceId: ${e.deviceId}\naddress: ${e.address}\ngoodsId: ${e.goodsId}\ngoodsName: ${e.goodsName}"
+                }
+                rows to total
+            }
+            else -> emptyList<Pair<Boolean, String>>() to 0
+        }
+    }
+
+    /**
+     * 将字段列表格式化为每行 3 个的紧凑布局
+     * 格式：key: value  |  key: value  |  key: value
+     */
+    private fun fmt(vararg fields: Pair<String, Any?>): String =
+        fields.toList().chunked(3).joinToString("\n") { row ->
+            row.joinToString("  |  ") { (k, v) -> "$k: ${v ?: "null"}" }
+        }
+
+    //--------------------------------------------------------------------------------------------------------
+
+//        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()
+        }
+    }
+
+    /**
+     * 按 goodsId 查重后 upsert 调料数据，确保同一 goodsId 只有一条记录
+     */
+    suspend fun upsertSeasoningByGoodsId(entity: SeasoningEntity) {
+        rep.upsertSeasoningByGoodsId(entity)
+    }
+
+    /**
+     * 按 goodsId 查询调料详情
+     */
+    suspend fun getSeasoningByGoodsId(goodsId: String): SeasoningEntity? {
+        return rep.getSeasoningByGoodsId(goodsId)
+    }
+
+    //--------------------------------------------------------------------------------------------------------
+
+    /**
+     * 已采集食材列表 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)
+        }
+    }
+
+    //--------------------------------------------------------------------------------------------------------
+}

app/src/main/java/com/shuwei/dish/match/db/dao/AppDao.kt

@@ -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
-    //--------------------------------------------------------------------------------------------
-}

app/src/main/java/com/shuwei/dish/match/db/dao/CookFoodDao.kt

@@ -1,20 +1,43 @@
-//package com.shuwei.dish.match.db.dao
+package com.shuwei.dish.match.db.dao
-//
+
-//import androidx.room.Dao
+import androidx.room.Dao
-//import androidx.room.Query
+import androidx.room.Insert
-//import com.shuwei.dish.match.db.BaseDao
+import androidx.room.OnConflictStrategy
-//import com.shuwei.dish.match.entity.CookFoodEntity
+import androidx.room.Query
-//
+import androidx.room.Update
-//@Dao
+import com.shuwei.dish.match.entity.CookFoodEntity
-//interface CookFoodDao : BaseDao<CookFoodEntity> {
+
-//
+@Dao
-//    @Query("SELECT * FROM dm_cook_food WHERE isDel = 0 AND foodId = :foodId AND cookMode = :cookMode")
+interface CookFoodDao {
-//    suspend fun getCookFoodById(foodId: String, cookMode:Int): CookFoodEntity?
+
-//
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
-//    @Query("SELECT * FROM dm_cook_food WHERE isDel = 0 AND cookMode = :cookMode")
+    suspend fun insertCookFood(item: CookFoodEntity): Long
-//    suspend fun getCookFoodList(cookMode:Int): MutableList<CookFoodEntity>?
+
-//
+    @Update
-//    @Query("SELECT count(1) FROM dm_cook_food WHERE isDel = 0 AND cookMode = :cookMode")
+    suspend fun updateCookFood(item: CookFoodEntity)
-//    suspend fun countCookFood(cookMode:Int): Int
+
-//
+    @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")
+    @Query("UPDATE dm_cook_food SET isDel = 1 WHERE isDel = 0 AND canteenId = :canteenId AND foodId = :foodId AND cookMode = :cookMode")
+    suspend fun deleteCookFood(canteenId: String, foodId: String, cookMode: Int)
+
+    /** 查询全部菜品记录（含已删除），用于数据库调试查看 */
+    @Query("SELECT * FROM dm_cook_food ORDER BY createTime DESC")
+    suspend fun getAllCookFood(): MutableList<CookFoodEntity>
+
+    /** 分页查询菜品记录，showDel=true 时包含已删除记录 */
+    @Query("SELECT * FROM dm_cook_food WHERE (:showDel = 1 OR isDel = 0) ORDER BY createTime DESC LIMIT :limit OFFSET :offset")
+    suspend fun getCookFoodPaged(showDel: Int, limit: Int, offset: Int): List<CookFoodEntity>
+
+    /** 统计菜品记录总数，showDel=true 时包含已删除记录 */
+    @Query("SELECT COUNT(*) FROM dm_cook_food WHERE (:showDel = 1 OR isDel = 0)")
+    suspend fun countCookFoodAll(showDel: Int): Int
+}

app/src/main/java/com/shuwei/dish/match/db/dao/CookFoodGoodsDao.kt

@@ -1,29 +1,43 @@
-//package com.shuwei.dish.match.db.dao
+package com.shuwei.dish.match.db.dao
-//
+
-//import androidx.room.Dao
+import androidx.room.Dao
-//import androidx.room.Query
+import androidx.room.Insert
-//import com.shuwei.dish.match.db.BaseDao
+import androidx.room.OnConflictStrategy
-//import com.shuwei.dish.match.entity.CookFoodGoodsEntity
+import androidx.room.Query
-//
+import androidx.room.Update
-//@Dao
+import com.shuwei.dish.match.entity.CookFoodGoodsEntity
-//interface CookFoodGoodsDao : BaseDao<CookFoodGoodsEntity> {
+
-//
+@Dao
-//    @Query("SELECT * FROM dm_cook_food_goods WHERE isDel = 0 AND foodId = :foodId")
+interface CookFoodGoodsDao {
-//    suspend fun getCookFoodGoodsList(foodId: String): MutableList<CookFoodGoodsEntity>
+
-//
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
-//    @Query("SELECT * FROM dm_cook_food_goods WHERE isDel = 0 AND foodId = :foodId AND materialType = :materialType")
+    suspend fun insertGoods(item: CookFoodGoodsEntity): Long
-//    suspend fun getCookFoodGoodsListByType(foodId: String, materialType:Int): MutableList<CookFoodGoodsEntity>
+
-//
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
-////    @Query(
+    suspend fun insertGoodsList(items: MutableList<CookFoodGoodsEntity>): Array<Long>
-////        """
+
-////        UPDATE dm_cook_food_goods
+    @Update
-////        SET goodsName=:entity.goodsName, foodId=:entity.foodId, relateionType=:entity.relateionType, sort=:entity.sort
+    suspend fun updateGoods(item: CookFoodGoodsEntity)
-////            allEdible=:entity.allEdible, useWeight=:entity.useWeight, isDel=:entity.isDel, createTime=:entity.createTime
+
-////        WHERE isDel = 0
+    @Query("SELECT * FROM dm_cook_food_goods WHERE isDel = 0 AND pid = :pid AND foodId = :foodId")
-////        AND foodId=:entity.foodId
+    suspend fun getCookFoodGoodsList(pid: Long, foodId: String): MutableList<CookFoodGoodsEntity>
-////        AND goodsId=:goodsId
+
-////    """
+    @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>
-////    fun updateByGoodsId(entity: CookFoodGoodsEntity)
+
-//
+    //    @Query("DELETE FROM dm_cook_food_goods WHERE pid = :pid AND foodId = :foodId")
-//}
+    @Query("UPDATE dm_cook_food_goods SET isDel = 1 WHERE isDel = 0 AND pid = :pid AND foodId = :foodId")
+    suspend fun deleteCookFoodGoodsList(pid: Long, foodId: String)
+
+    /** 查询全部食材记录（含已删除），用于数据库调试查看 */
+    @Query("SELECT * FROM dm_cook_food_goods ORDER BY createTime DESC")
+    suspend fun getAllCookFoodGoods(): MutableList<CookFoodGoodsEntity>
+
+    /** 分页查询食材记录，showDel=true 时包含已删除记录 */
+    @Query("SELECT * FROM dm_cook_food_goods WHERE (:showDel = 1 OR isDel = 0) ORDER BY createTime DESC LIMIT :limit OFFSET :offset")
+    suspend fun getCookFoodGoodsPaged(showDel: Int, limit: Int, offset: Int): List<CookFoodGoodsEntity>
+
+    /** 统计食材记录总数，showDel=true 时包含已删除记录 */
+    @Query("SELECT COUNT(*) FROM dm_cook_food_goods WHERE (:showDel = 1 OR isDel = 0)")
+    suspend fun countCookFoodGoodsAll(showDel: Int): Int
+}

app/src/main/java/com/shuwei/dish/match/db/dao/SeasoningDao.kt

@@ -1,25 +1,56 @@
-//package com.shuwei.dish.match.db.dao
+package com.shuwei.dish.match.db.dao
-//
+
-//import androidx.room.Dao
+import androidx.room.Dao
-//import androidx.room.Query
+import androidx.room.Insert
-//import com.shuwei.dish.match.db.BaseDao
+import androidx.room.OnConflictStrategy
-//import com.shuwei.dish.match.entity.SeasoningEntity
+import androidx.room.Query
-//import kotlinx.coroutines.flow.Flow
+import androidx.room.Update
-//
+import com.shuwei.dish.match.entity.SeasoningEntity
-//@Dao
+
-//interface SeasoningDao : BaseDao<SeasoningEntity> {
+@Dao
-//
+interface SeasoningDao {
-////    @Query("SELECT * FROM dm_seasoning WHERE isDel = 0 AND id = :id")
+
-////    suspend fun getSeasoningById(id: Long): SeasoningEntity?
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
-////
+    suspend fun insertSeasoning(item: SeasoningEntity): Long
-////    @Query("SELECT * FROM dm_seasoning WHERE isDel = 0 ORDER BY sort ASC")
+
-////    fun getAllStream(): Flow<MutableList<SeasoningEntity>>
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
-////
+    suspend fun insertSeasoningList(items: MutableList<SeasoningEntity>): Array<Long>
-////    @Query("SELECT * FROM dm_seasoning WHERE isDel = 0 AND  name LIKE '%' || :query || '%'")
+
-////    suspend fun search(query: String): MutableList<SeasoningEntity>
+    @Update
-////
+    suspend fun updateSeasoning(item: SeasoningEntity)
-////    @Query("DELETE FROM dm_seasoning WHERE rowid IN " +
+
-////            "(SELECT rowid FROM dm_seasoning LIMIT 1000)")
+    @Query("SELECT * FROM dm_seasoning WHERE isDel = 0 AND id = :id")
-////    suspend fun deleteBatch(): Int
+    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: String): 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")
+    @Query("UPDATE dm_seasoning SET isDel = 1 WHERE isDel = 0 AND sort = :sort")
+    suspend fun deleteSeasoningBySort(sort: Int): Int
+
+    //    @Query("DELETE FROM dm_seasoning WHERE isDel = 0")
+    @Query("UPDATE dm_seasoning SET isDel = 1 WHERE isDel = 0")
+    suspend fun clearAllSeasoning(): Int
+
+    /** 查询全部调料记录（含已删除），用于数据库调试查看 */
+    @Query("SELECT * FROM dm_seasoning ORDER BY sort ASC")
+    suspend fun getAllSeasoning(): MutableList<SeasoningEntity>
+
+    /** 分页查询调料记录，showDel=true 时包含已删除记录 */
+    @Query("SELECT * FROM dm_seasoning WHERE (:showDel = 1 OR isDel = 0) ORDER BY sort ASC LIMIT :limit OFFSET :offset")
+    suspend fun getSeasoningPaged(showDel: Int, limit: Int, offset: Int): List<SeasoningEntity>
+
+    /** 统计调料记录总数，showDel=true 时包含已删除记录 */
+    @Query("SELECT COUNT(*) FROM dm_seasoning WHERE (:showDel = 1 OR isDel = 0)")
+    suspend fun countSeasoningAll(showDel: Int): Int
+}

app/src/main/java/com/shuwei/dish/match/db/dao/SeasoningSlotDao.kt

@@ -0,0 +1,63 @@
+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>
+
+    /** 分页查询槽位记录（槽位表无 isDel，showDel 参数忽略） */
+    @Query("SELECT * FROM dm_seasoning_slot ORDER BY deviceId ASC, address ASC LIMIT :limit OFFSET :offset")
+    suspend fun getSlotPaged(limit: Int, offset: Int): List<SeasoningSlotEntity>
+
+    /** 统计槽位记录总数 */
+    @Query("SELECT COUNT(*) FROM dm_seasoning_slot")
+    suspend fun countSlotAll(): Int
+
+    /**
+     * 删除指定设备的指定槽位配置
+     * @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)
+}

app/src/main/java/com/shuwei/dish/match/dialog/CommonDialog.kt

@@ -1,18 +1,18 @@
 package com.shuwei.dish.match.dialog
 
-import android.app.Activity
 import android.app.Dialog
 import android.content.Context
 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.core.view.updateLayoutParams
-import androidx.fragment.app.FragmentActivity
+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
+import com.shuwei.dish.match.R
 
 open class CommonDialog(
     context: Context
@@ -20,62 +20,115 @@ 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)
+        // 弹窗不允许点击外部关闭
+        setCancelable(false)
         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()
             }
+            // 透明背景，让 shape_dialog_bg 的阴影层正常显示
             setBackgroundDrawable(ColorDrawable())
-            setCancelable(false)
+            // 应用缩放+淡入淡出动画
-//            setFlags(
+            setWindowAnimations(R.style.CommonDialogAnimation)
-//                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
+        }
-//                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+        // 主/从设备边距微调：主设备内容区域更大，适当增加上下留白
-//            )
+        val verticalMargin = if (GlobalData.deviceRole == DeviceRole.MASTER) 48.dp else 36.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 {
+        // 3按钮点击事件（negativeClick/positiveClick 与2按钮模式共用）
-            removeAllViews()
+        binding.btnTop.setOnClickListener {
-            addView(messageView)
+            negativeClick?.invoke()
+            dismiss()
+        }
+        binding.btnMiddle.setOnClickListener {
+            neutralClick?.invoke()
+            dismiss()
+        }
+        binding.btnBottom.setOnClickListener {
+            positiveClick?.invoke()
+            dismiss()
         }
-        addListener()
-    }
 
-    private fun addListener() {
+        setOnDismissListener { dismissCallback?.invoke() }
-        binding.btnLeft.setOnClickListener { onLeftClick?.invoke() }
-        binding.btnRight.setOnClickListener { onRightClick?.invoke() }
-        setOnDismissListener { onDismiss?.invoke() }
     }
 
-
     override fun show() {
         super.show()
-        binding.btnLeft.text = leftText
+        binding.tvTitle.text = titleText
-        binding.btnRight.text = rightText
+        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
 
-    var messageView: View? = null
+        val hasThreeButtons = !neutralText.isNullOrEmpty()
-    var onLeftClick: (() -> Unit)? = null
+        binding.layoutButtonsHorizontal.visibility = if (hasThreeButtons) View.GONE else View.VISIBLE
-    var onRightClick: (() -> Unit)? = null
+        binding.layoutButtonsVertical.visibility = if (hasThreeButtons) View.VISIBLE else View.GONE
 
-    var leftText = ""
+        if (hasThreeButtons) {
-    var rightText = ""
+            // 3按钮模式：顶部=取消，中间=中立，底部=确认
-
+            binding.btnTop.text = negativeText
-    var onDismiss: (() -> Unit)? = null
+            binding.btnMiddle.text = neutralText
-
+            binding.btnBottom.text = positiveText
-}
+        } else {
-
+            // 2按钮模式
-open class SafeDialog(activity: Activity, @StyleRes themeResId: Int) :
+            binding.btnLeft.text = negativeText
-    Dialog(activity, themeResId) {
+            binding.btnRight.text = positiveText
-    private val weakContext = WeakReference(activity)
-
-    override fun show() {
-        weakContext.get()?.let {
-            if (!it.isFinishing && !it.isDestroyed) super.show()
         }
     }
 }

app/src/main/java/com/shuwei/dish/match/dialog/DialogTool.kt

@@ -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()
-    }
-
-}

app/src/main/java/com/shuwei/dish/match/dialog/FoodRecognizeDialog.kt

@@ -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.FoodAdapter
+//import com.shuwei.dish.match.base.BaseActivity
+//import com.shuwei.dish.match.databinding.DialogFoodRecognizeBinding
+//import com.shuwei.dish.match.entity.GoodsItem
+//
+///**
+// * 菜品识别结果弹窗，继承 BottomSheetDialog 确保只初始化一次
+// * @param activity 宿主 Activity
+// * @param onDismiss 弹窗关闭时的额外回调（可选）
+// * @param onItemSelected 用户点击某一菜品时的回调
+// */
+//class FoodRecognizeDialog(
+//    private val activity: BaseActivity,
+//    private val onDismiss: (() -> Unit)? = null,
+//    private val onItemSelected: (item: GoodsItem) -> Unit
+//) : BottomSheetDialog(activity, R.style.BottomSheet) {
+//
+//    private val binding = DialogFoodRecognizeBinding.inflate(LayoutInflater.from(activity))
+//    private val list = mutableListOf<GoodsItem>()
+//    private val adapter = FoodAdapter(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<GoodsItem>) {
+//        list.clear()
+//        list.addAll(items)
+//        adapter.notifyDataSetChanged()
+//        if (!isShowing) show()
+//    }
+//}

app/src/main/java/com/shuwei/dish/match/dialog/FoodSearchDialog.kt

@@ -1,245 +1,287 @@
 package com.shuwei.dish.match.dialog
 
 import android.annotation.SuppressLint
-import android.os.Handler
+import android.graphics.Rect
-import android.os.Looper
 import android.text.Editable
+import android.view.KeyboardShortcutGroup
 import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MotionEvent
 import android.view.View
+import android.view.Window
+import android.widget.FrameLayout
 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.LinearLayoutManager
 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.adapter.FoodAdapter
 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.databinding.LayoutEmptyViewBinding
+import com.shuwei.dish.match.dialog.SeasoningSelectDialog.Companion.PAGE_SIZE
+import com.shuwei.dish.match.entity.GoodsItem
+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.launch
 
 /**
- * 食材搜索弹窗
+ * 食材搜索弹窗，继承 BottomSheetDialog 确保只初始化一次
+ * @param activity 宿主 Activity
+ * @param defGoodsName 默认填充的食材名称（可选）
+ * @param onItemSelected 用户点击某一食材时的回调
  */
 class FoodSearchDialog(
-    private var defGoodsName: String? = null
+    private val activity: BaseActivity,
-) {
+    private val defGoodsName: String? = null,
+    private val onItemSelected: (item: GoodsItem) -> Unit
+) : BottomSheetDialog(activity, R.style.BottomSheet) {
+
     companion object {
-        const val TAG = "BottomDialog"
+        const val PAGE_SIZE = 50
     }
 
-    private var list = mutableListOf<CookFoodGoodsEntity>()
+    private val binding = DialogFoodSearchBinding.inflate(LayoutInflater.from(activity))
-
+    private val list = mutableListOf<GoodsItem>()
-    private lateinit var binding: DialogFoodSearchBinding
+        .apply {
-    private lateinit var searchAdapter: GoodsInfoSearchAdapter
+        add(GoodsItem(goodsId = "200001", goodsName = "土豆丝"))
-    private var goodsName: String? = null
+        add(GoodsItem(goodsId = "200002", goodsName = "土豆片"))
-
+        add(GoodsItem(goodsId = "200003", goodsName = "土豆丁"))
-    private var activity: BaseActivity? = null
+        add(GoodsItem(goodsId = "200004", goodsName = "胡萝卜丝"))
-
+        add(GoodsItem(goodsId = "200005", goodsName = "胡萝卜片"))
-    fun show(activity: BaseActivity, callback: (item: CookFoodGoodsEntity) -> Unit) {
+        add(GoodsItem(goodsId = "200006", goodsName = "胡萝卜丁"))
-        this.activity = activity
+        add(GoodsItem(goodsId = "200007", goodsName = "黄瓜丝"))
-        //直接使用BottomSheetDialog
+        add(GoodsItem(goodsId = "200008", goodsName = "黄瓜片"))
-        var dialog: BottomSheetDialog? = null
+        add(GoodsItem(goodsId = "200009", goodsName = "黄瓜丁"))
-        val inflater = LayoutInflater.from(activity)
+        add(GoodsItem(goodsId = "200010", goodsName = "洋葱丝"))
-        binding = DialogFoodSearchBinding.inflate(inflater)
+        add(GoodsItem(goodsId = "200011", goodsName = "洋葱丁"))
-        dialog = BottomSheetDialog(activity, R.style.BottomSheet).apply {
+        add(GoodsItem(goodsId = "200012", goodsName = "A"))
-            setContentView(binding.root)
+        add(GoodsItem(goodsId = "200013", goodsName = "B"))
-            setCancelable(true)
+        add(GoodsItem(goodsId = "200014", goodsName = "C"))
-            behavior.skipCollapsed = false // 跳过折叠状态
+        add(GoodsItem(goodsId = "200015", goodsName = "D"))
-//            behavior.peekHeight = 880.dp
+        add(GoodsItem(goodsId = "200016", goodsName = "E"))
-//            window?.setLayout(-1, 880.dp)
+        add(GoodsItem(goodsId = "200017", goodsName = "F"))
-            show()
+        add(GoodsItem(goodsId = "200018", goodsName = "G"))
-            setOnDismissListener {
+        add(GoodsItem(goodsId = "200019", goodsName = "H"))
-                activity.hideStatusBar()
+    }
-            }
+    private val adapter = FoodAdapter(list).apply {
-            binding.etSheetInput.requestFocus()
+        isStateViewEnable = true
+        setOnItemClickListener { _, _, position ->
+            list[position].isClicked = true
+            notifyItemChanged(position)
+            binding.root.postDelayed({
+                onItemSelected(list[position])
+                dismiss()
+            }, 300)
         }
+    }
+
+    private var goodsName: String? = null
+    private var pageNo = 1
+
+    init {
+        setContentView(binding.root)
+        setCancelable(true)
+        behavior.skipCollapsed = false
+        setOnDismissListener { activity.hideStatusBar() }
+
         binding.tvSheetName.text = "食材检索"
+
+        // 输入框：清空时重置列表
         binding.etSheetInput.run {
             hint = "输入食材名称或速记码"
-            addTextChangedListener(afterTextChanged = { it: Editable? ->
+            addTextChangedListener(
-                if (it.isNullOrBlank()) {
+                onTextChanged = { text, _, _, _ -> goodsName = text.toString() },
-                    list.clear()
+                afterTextChanged = { it: Editable? ->
-                    searchAdapter.notifyDataSetChanged()
+                    if (it.isNullOrBlank()) {
+                        list.clear()
+                        adapter.notifyDataSetChanged()
+                    }
                 }
-            })
+            )
-        }
+            addOnActionSearchListener { searchGoods(this) }
-        searchAdapter = GoodsInfoSearchAdapter(list).apply {
-            setOnItemClickListener { _, _, position ->
-                list[position].isClicked = true
-                notifyItemChanged(position)
-                Handler(Looper.getMainLooper()).postDelayed({
-                    callback(list[position])
-                    dialog?.dismiss()
-                }, 300)
-            }
         }
+
+        // RecyclerView 初始化
         binding.recyclerView.run {
             layoutManager = GridLayoutManager(activity, 2, GridLayoutManager.VERTICAL, false)
-            adapter = searchAdapter
+            adapter = this@FoodSearchDialog.adapter
-            addOnScrollListener(object : RecyclerView.OnScrollListener() {
+//            addOnScrollListener(object : RecyclerView.OnScrollListener() {
-                override fun onScrollStateChanged(rv: RecyclerView, newState: Int) {
+//                override fun onScrolled(rv: RecyclerView, dx: Int, dy: Int) {
-                    super.onScrollStateChanged(rv, newState);
+//                    super.onScrolled(rv, dx, dy)
-                }
+//                    // 解决 RecyclerView 与 SmartRefreshLayout 滑动冲突
-
+//                    val topRowVerticalPosition = if (rv.isEmpty()) 0 else rv.getChildAt(0).top
-                override fun onScrolled(rv: RecyclerView, dx: Int, dy: Int) {
+//                    binding.refreshLayout.setNestedScrollingEnabled(topRowVerticalPosition >= 0)
-                    //解决RecyclerView和smartRefreshLayout滑动冲突问题
+//                }
-                    super.onScrolled(rv, dx, dy)
+//            })
-                    val topRowVerticalPosition = if (rv.isEmpty()) 0 else rv.getChildAt(0).top
-                    binding.refreshLayout.setNestedScrollingEnabled(topRowVerticalPosition >= 0)
-                }
-            })
-        }
-        binding.refreshLayout.setOnRefreshListener {
-            pageNo = 1
-            getGoodsList()
         }
 
-        binding.refreshLayout.setOnLoadMoreListener {
+        binding.refreshLayout.run {
-            getGoodsList()
+            setEnableRefresh(false)
+            setEnableLoadMore(false)
+            setOnRefreshListener { pageNo = 1; getGoodsList() }
+            setOnLoadMoreListener { getGoodsList() }
         }
-        binding.etSheetInput.addTextChangedListener(
+
-            onTextChanged = { text, start, before, count ->
+        binding.ivSearch.setOnClickListener { searchGoods(it) }
-                goodsName = text.toString()
+        binding.root.setOnClickListener { KeyboardUtil.hideKeyboard(it) }
-            })
+
-        binding.ivSearch.setOnClickListener { v ->
+        initObserver()
-            searchGoods(v)
+
-        }
+//        // 若有默认食材名称，自动填充并触发搜索
-        binding.root.setOnClickListener { v ->
+//        //if (!defGoodsName.isNullOrBlank()) {
-            KeyboardUtil.hideKeyboard(v.context, v)
+//            binding.etSheetInput.setText(defGoodsName)
-        }
+//            pageNo = 1
-        binding.etSheetInput.let { v ->
+//            getGoodsList()
-            v.addOnActionSearchListener {
+//            KeyboardUtil.hideKeyboard(binding.root)
-                searchGoods(v)
+//        //}
+    }
+
+    /** 弹窗显示时在 Window.Callback 层提前拦截触摸，解决 BottomSheet 拖拽与列表滑动的手势冲突 */
+    override fun show() {
+        super.show()
+        // 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)
             }
-        }
-        binding.refreshLayout.setEnableRefresh(false)
-        binding.refreshLayout.setEnableLoadMore(false)
 
-        if (defGoodsName.isNullOrBlank().not()) {
+            override fun onPointerCaptureChanged(hasCapture: Boolean) {
-            binding.etSheetInput.let {
+                originalCallback.onPointerCaptureChanged(hasCapture)
-                it.setText(defGoodsName)
+            }
-                searchGoods(it)
+
+            override fun onProvideKeyboardShortcuts(
+                data: List<KeyboardShortcutGroup?>?,
+                menu: Menu?,
+                deviceId: Int
+            ) {
+                originalCallback.onProvideKeyboardShortcuts(data, menu, deviceId)
             }
         }
     }
 
+    /**
+     * 收集 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}")
+            activity.toast("请${binding.etSheetInput.hint}")
             return
         }
         pageNo = 1
         getGoodsList()
-        KeyboardUtil.hideKeyboard(v.context, v)
+        KeyboardUtil.hideKeyboard(v)
     }
 
-    private var pageNo = 1
+    /**
-    private val pageSize = 50
+     * 请求食材列表
+     */
+    private fun getGoodsList() {
+        activity.netViewModel.queryGoodsList(
+            goodsType = "0",
+            pageNum = pageNo,
+            pageSize = PAGE_SIZE,
+            goodsName = goodsName.takeUnless { it.isNullOrBlank() }
+        )
+    }
 
     /**
+     * 将返回数据填充到列表
      */
     @SuppressLint("NotifyDataSetChanged")
-    private fun getGoodsList() {
+    private fun loadGoodsList(records: MutableList<GoodsItem>?) {
-//        val pathSegmentList = UrlConfig.QUERY_GOODS_LIST.split(delimiters = arrayOf("/"), limit = 1)
+        finishRefresh()
-//        val queryParams = mutableMapOf(
+        if (records.isNullOrEmpty()) {
-//            "goodsType" to "0",
+            if (pageNo == 1) {
-//            "canteenId" to BaseApp.canteenId,
+                loadEmptyView()
-//            "pageNo" to "$pageNo",
+            }
-//            "pageSize" to "$pageSize"
+            return
-//        )
-//        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("暂未搜索到食材信息")
-//                    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)
-//                }
-//            })
-        val param = mutableMapOf<String, Any>(
-            "goodsType" to "0",
-            "placeId" to BaseApp.canteenId,
-            "pageNum" to pageNo,
-            "pageSize" to pageSize
-        )
-        if (goodsName.isNullOrBlank().not()) {
-            param.put("goodsName", goodsName!!)
         }
-        activity?.queryGoodsList(param = param, onSuccess = {
+        binding.recyclerView.layoutManager = GridLayoutManager(activity, 2, GridLayoutManager.VERTICAL, false)
-            loadGoodsList(it)
+        if (pageNo == 1) list.clear()
-        }, onFailure = { code, msg ->
+        list.addAll(records)
-            activity?.toast(msg)
+        adapter.notifyDataSetChanged()
-            finishRefresh()
+        val isLoadMoreEnable = records.size >= PAGE_SIZE
-        })
+        binding.refreshLayout.setEnableLoadMore(isLoadMoreEnable)
+        if (isLoadMoreEnable) pageNo++
     }
 
     private fun finishRefresh() {
-        if (pageNo == 1) {
+        if (pageNo == 1) binding.refreshLayout.finishRefresh()
-            binding.refreshLayout.finishRefresh()
+        else binding.refreshLayout.finishLoadMore()
-        } else {
-            binding.refreshLayout.finishLoadMore()
-        }
     }
 
+    private var emptyViewBinding: LayoutEmptyViewBinding? = null
+
     @SuppressLint("NotifyDataSetChanged")
-    private fun loadGoodsList(records: MutableList<CookFoodGoodsEntity>?) {
+    private fun loadEmptyView() {
-        finishRefresh()
+        try {
-        if (records.isNullOrEmpty()) {
+            binding.refreshLayout.setEnableRefresh(true)
-            activity?.toast("暂未搜索到食材信息")
+            binding.refreshLayout.setEnableLoadMore(false)
-            return
-        }
-        if (pageNo == 1) {
             list.clear()
-        }
+            adapter.notifyDataSetChanged()
-        list.addAll(records)
+            if (emptyViewBinding == null) {
-        searchAdapter.notifyDataSetChanged()
+                emptyViewBinding = LayoutEmptyViewBinding.inflate(
-        val isLoadMoreEnable = records.size >= pageSize
+                    LayoutInflater.from(activity),
-        binding.refreshLayout.setEnableLoadMore(isLoadMoreEnable)
+                    binding.recyclerView,
-        if (isLoadMoreEnable) {
+                    false
-            pageNo++
+                )
+            }
+            emptyViewBinding!!.tvContent.text = "暂无数据"
+            emptyViewBinding!!.tvSubContent.text = "未查询到食材信息，请联系管理员添加"
+            emptyViewBinding!!.root.layoutParams = FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.MATCH_PARENT,
+                FrameLayout.LayoutParams.MATCH_PARENT
+            )
+            binding.recyclerView.layoutManager = LinearLayoutManager(activity)
+            binding.recyclerView.post {
+                emptyViewBinding!!.root.minimumHeight = binding.recyclerView.height
+                adapter.stateView = emptyViewBinding!!.root
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
         }
     }
-
 }
-

app/src/main/java/com/shuwei/dish/match/dialog/LoadingDialog.kt

@@ -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 = "加载中……",
+    message: String,
-    private var onDismiss: () -> Unit = {}
+    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(
+//            setFlags(
-                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
+//                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
-                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+//                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
-            );
+//            );
         }
         setOnDismissListener {
             onDismiss()
         }
     }
+
+    fun updateContent(content: String) {
+        binding.tvMessage.text = content
+    }
 }
 
 //class LoadingDialog3(

app/src/main/java/com/shuwei/dish/match/dialog/SeasoningSearchDialog.kt

@@ -1,344 +1,259 @@
-package com.shuwei.dish.match.dialog
+//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.Editable
-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.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.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
-
-/**
- * 调料搜索弹窗
- */
-class SeasoningSearchDialog(
-    private var weighIndex: Int,
-    private var weighAddress: Int,
-    private var clickName: String? = null
-) {
-    companion object {
-        const val TAG = "BottomDialog2"
-    }
-
-    private var list = mutableListOf<SeasoningEntity>()
-
-    private lateinit var binding: DialogSeasoningSearchBinding
-    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 = DialogSeasoningSearchBinding.inflate(inflater)
-
-        binding.etSheetInput.run {
-            hint = "输入调料名称"
-            addTextChangedListener(afterTextChanged = { it: Editable? ->
-                if (it.isNullOrBlank()) {
-                    list.clear()
-                    searchAdapter.notifyDataSetChanged()
-                }
-            })
-        }
-        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)
-//            window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
-            window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
-            //or WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN
-            //or WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING // 禁用额外平移
-            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)
-            show()
-//            val onGlobalLayoutListener = ViewTreeObserver.OnGlobalLayoutListener {
-//                val r = Rect()
-//                binding.root.getWindowVisibleDisplayFrame(r)
-//                val screenHeight = binding.root.rootView.height
-//                val keyboardHeight = screenHeight - r.bottom
 //
-//                // 软键盘弹出（高度>200dp）
+//import android.annotation.SuppressLint
-//                if (keyboardHeight > 200.dp) {
+//import android.graphics.Typeface
-//                    // 调整 Dialog 底部边距，避开软键盘
+//import android.os.Handler
-//                    val layoutParams = binding.root.layoutParams as ViewGroup.MarginLayoutParams
+//import android.os.Looper
-////                    layoutParams.bottomMargin = keyboardHeight
+//import android.text.SpannableStringBuilder
-//                    layoutParams.bottomMargin = 200.dp
+//import android.text.style.AbsoluteSizeSpan
-//                    binding.root.layoutParams = layoutParams
+//import android.text.style.ForegroundColorSpan
-//                } else {
+//import android.text.style.LineHeightSpan
-//                    // 软键盘收起，恢复边距
+//import android.text.style.StyleSpan
-//                    val layoutParams = binding.root.layoutParams as ViewGroup.MarginLayoutParams
+//import android.util.Log
-//                    layoutParams.bottomMargin = 0
+//import android.view.Gravity
-//                    binding.root.layoutParams = layoutParams
+//import android.view.LayoutInflater
-//                }
+//import android.view.View
-//            }
+//import android.view.ViewGroup
-            setOnDismissListener {
+//import android.view.WindowManager
-                activity.hideStatusBar()
+//import androidx.core.graphics.toColorInt
-//                binding.root.viewTreeObserver.removeOnGlobalLayoutListener(onGlobalLayoutListener)
+//import androidx.core.view.isEmpty
-            }
+//import androidx.core.widget.addTextChangedListener
-//            binding.root.viewTreeObserver.addOnGlobalLayoutListener(onGlobalLayoutListener)
+//import androidx.lifecycle.Lifecycle
-        }
+//import androidx.lifecycle.lifecycleScope
-        binding.refreshLayout.setOnRefreshListener {
+//import androidx.lifecycle.repeatOnLifecycle
-            pageNo = 1
+//import androidx.recyclerview.widget.GridLayoutManager
-            getGoodsList()
+//import androidx.recyclerview.widget.RecyclerView
-        }
+//import com.google.android.material.bottomsheet.BottomSheetDialog
-
+//import com.shuwei.dish.match.R
-        binding.refreshLayout.setOnLoadMoreListener {
+//import com.shuwei.dish.match.adapter.SeasoningSearchAdapter
-            getGoodsList()
+//import com.shuwei.dish.match.base.BaseActivity
-        }
+//import com.shuwei.dish.match.base.BaseApp
-        binding.etSheetInput.addTextChangedListener(
+//import com.shuwei.dish.match.databinding.DialogSeasoningSearchBinding
-            onTextChanged = { text, start, before, count ->
+//import com.shuwei.dish.match.entity.SeasoningEntity
-                goodsName = text.toString()
+//import com.shuwei.dish.match.net.UiState
-            })
+//import com.shuwei.dish.match.utils.KeyboardUtil
-        binding.ivSearch.setOnClickListener { v ->
+//import com.shuwei.dish.match.utils.WeightUtil
-            searchGoods(v)
+//import com.shuwei.dish.match.utils.ext.addOnActionSearchListener
-        }
+//import com.shuwei.dish.match.utils.ext.appendText
-        binding.root.setOnClickListener { v ->
+//import com.shuwei.dish.match.utils.ext.buildSpannableString
-            KeyboardUtil.hideKeyboard(v.context, v)
+//import com.shuwei.dish.match.utils.ext.dp
-        }
+//import com.shuwei.dish.match.utils.ext.roundedDecimalPlace
-        binding.etSheetInput.let { v ->
+//import com.shuwei.dish.match.utils.ext.toast
-            v.addOnActionSearchListener {
+//import kotlinx.coroutines.launch
-                searchGoods(v)
+//
-            }
+///**
-        }
+// * 调料搜索弹窗，继承 BottomSheetDialog 确保只初始化一次
-        binding.refreshLayout.setEnableRefresh(false)
+// * @param activity 宿主 Activity
-        binding.refreshLayout.setEnableLoadMore(false)
+// * @param weighIndex 秤的索引
-        binding.tvClear.setOnClickListener {
+// * @param weighAddress 秤的地址，用于监听重量和去皮
-            Log.d(TAG, "show: weighAddress=$weighAddress")
+// * @param clickName 默认填充的调料名称（可选）
-            WeightUtil.tareTwo(weighAddress)
+// * @param onItemSelected 用户点击某一调料时的回调，携带当前重量
-//            repeat(14) { num->
+// */
-//                Log.d(TAG, "show: num=$num")
+//class SeasoningSearchDialog(
-//                WeightUtil.tareTwo(num+1)
+//    private val activity: BaseActivity,
-//            }
+//    private val weighIndex: Int,
-        }
+//    private val weighAddress: Int,
-        WeightUtil.addWeightListener(
+//    private val clickName: String? = null,
-            weightKey = TAG,
+//    private val onItemSelected: (item: SeasoningEntity) -> Unit
-            getWeight = { address, state, weight ->
+//) : BottomSheetDialog(activity, R.style.BottomSheet) {
-                if (weighAddress == address) {
+//
-                    this.currentWeight = weight.toDouble()
+//    companion object {
-                    binding.tvWeight.text = getTextSpan(weight)
+//        const val TAG = "BottomDialog2"
-                }
+//    }
-            })
+//
-        binding.tvWeight.text = getTextSpan(0.0)
+//    private val binding = DialogSeasoningSearchBinding.inflate(LayoutInflater.from(activity))
-
+//    private val list = mutableListOf<SeasoningEntity>()
-        if (clickName.isNullOrBlank().not()) {
+//    private val adapter = SeasoningSearchAdapter(list).apply {
-            binding.etSheetInput.setText(clickName!!.trim())
+//        setOnItemClickListener { _, _, position ->
-            pageNo = 1
+//            list[position].isClicked = true
-            getGoodsList()
+//            notifyItemChanged(position)
-        }
+//            Handler(Looper.getMainLooper()).postDelayed({
-    }
+//                onItemSelected(list[position].also { it.useWeight = currentWeight })
-
+//                dismiss()
-    private fun searchGoods(v: View) {
+//            }, 300)
-        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 = 50
-
-    /**
-     */
-    @SuppressLint("NotifyDataSetChanged")
-    private fun getGoodsList() {
-//        val queryParams = mutableMapOf(
-//            "goodsType" to "1",
-//            "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("?")
+//    private var goodsName: String? = null
-//            queryParams.forEach { (key, value) ->
+//    private var currentWeight = 0.0
-//                append("$key=$value&")
+//    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()
 //        }
-//        sb.deleteCharAt(sb.length - 1)
+//
-//        Log.d(TAG, "getGoodsList: url = $sb")
+//        // 输入框：清空时重置列表
-//        HttpUtil.get(
+//        binding.etSheetInput.run {
-//            url = sb.toString(),
+//            hint = "输入调料名称"
-//            doSuccess = {
+//            addTextChangedListener(
-//                val json = it.toJsonString()
+//                onTextChanged = { text, _, _, _ -> goodsName = text.toString() },
-//                Log.d(TAG, "getGoodsList: json=$json")
+//                afterTextChanged = {
-//                val recordBean: SeasoningRecordBean? = json.toObject<SeasoningRecordBean>()
+//                    if (it.isNullOrBlank()) {
-//                if (recordBean == null || recordBean.records.isNullOrEmpty()) {
+//                        list.clear()
-//                    activity?.toast( "暂未搜索到调料信息")
+//                        adapter.notifyDataSetChanged()
-//                    return@get
+//                    }
 //                }
-//                val records = recordBean.records
+//            )
-//                if (pageNo == 1) {
+//            addOnActionSearchListener { searchGoods(this) }
-//                    list.clear()
+//        }
-//                }
+//
-//                list.addAll(records!!)
+//        // RecyclerView 初始化及滑动冲突处理
-//                searchAdapter.notifyDataSetChanged()
+//        binding.recyclerView.let {
-//                if (pageNo == 1) {
+//            it.layoutManager = GridLayoutManager(activity, 2, GridLayoutManager.VERTICAL, false)
-//                    binding.refreshLayout.finishRefresh(1200)
+//            it.adapter = adapter
-//                } else {
+//            it.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-//                    binding.refreshLayout.finishLoadMore(1200)
+//                override fun onScrolled(rv: RecyclerView, dx: Int, dy: Int) {
-//                }
+//                    super.onScrolled(rv, dx, dy)
-//                val isLoadMoreEnable = records.size >= pageSize
+//                    // 解决 RecyclerView 与 SmartRefreshLayout 滑动冲突
-//                binding.refreshLayout.setEnableLoadMore(isLoadMoreEnable)
+//                    val topRowVerticalPosition = if (rv.isEmpty()) 0 else rv.getChildAt(0).top
-//                if (isLoadMoreEnable) {
+//                    binding.refreshLayout.setNestedScrollingEnabled(topRowVerticalPosition >= 0)
-//                    pageNo++
-//                }
-//            }, doFailure = { code, msg ->
-//                activity?.toast(msg)
-//                if (pageNo == 1) {
-//                    binding.refreshLayout.finishRefresh(1200)
-//                } else {
-//                    binding.refreshLayout.finishLoadMore(1200)
 //                }
 //            })
-
+//        }
-
+//
-        val param = mutableMapOf<String, Any>(
+//        binding.refreshLayout.run {
-            "goodsType" to "1",
+//            setEnableRefresh(false)
-            "placeId" to BaseApp.canteenId,
+//            setEnableLoadMore(false)
-            "pageNum" to pageNo,
+//            setOnRefreshListener { pageNo = 1; getGoodsList() }
-            "pageSize" to pageSize
+//            setOnLoadMoreListener { getGoodsList() }
-        )
+//        }
-        if (goodsName.isNullOrBlank().not()) {
+//
-            param.put("goodsName", goodsName!!)
+//        binding.ivSearch.setOnClickListener { searchGoods(it) }
-        }
+//        binding.root.setOnClickListener { KeyboardUtil.hideKeyboard(it) }
-        activity?.querySeasoningList(
+//
-            param = param,
+//        // 去皮按钮
-            onSuccess = {
+//        binding.tvClear.setOnClickListener {
-                loadGoodsList(it)
+//            Log.d(TAG, "tareTwo: weighAddress=$weighAddress")
-            },
+//            WeightUtil.tareTwo(weighAddress)
-            onFailure = { code, msg ->
+//        }
-                activity?.toast(msg)
+//
-                finishRefresh()
+//        // 监听对应秤的重量变化
-            }
+//        WeightUtil.addWeightListener(
-        )
+//            weightKey = TAG,
-    }
+//            getWeight = { address, _, weight ->
-
+//                if (weighAddress == address) {
-    @SuppressLint("NotifyDataSetChanged")
+//                    currentWeight = weight.toDouble()
-    private fun loadGoodsList(records: MutableList<SeasoningEntity>?) {
+//                    binding.tvWeight.text = getTextSpan(weight)
-        finishRefresh()
+//                }
-        if (records.isNullOrEmpty()) {
+//            }
-            activity?.toast("暂未搜索到调料信息")
+//        )
-            return
+//        binding.tvWeight.text = getTextSpan(0.0)
-        }
+//
-        if (pageNo == 1) {
+//        initObserver()
-            list.clear()
+//
-        }
+//        // 若有默认调料名称，自动填充并触发搜索
-        list.addAll(records)
+//        if (!clickName.isNullOrBlank()) {
-        searchAdapter.notifyDataSetChanged()
+//            binding.etSheetInput.setText(clickName.trim())
-        val isLoadMoreEnable = records.size >= pageSize
+//            pageNo = 1
-        binding.refreshLayout.setEnableLoadMore(isLoadMoreEnable)
+//            getGoodsList()
-        if (isLoadMoreEnable) {
+//        }
-            pageNo++
+//    }
-        }
+//
-    }
+//    /**
-
+//     * 收集 seasoningListState，统一处理 Loading / Success / Error 状态
-    private fun finishRefresh() {
+//     */
-        if (pageNo == 1) {
+//    private fun initObserver() {
-            binding.refreshLayout.finishRefresh()
+//        activity.lifecycleScope.launch {
-        } else {
+//            activity.repeatOnLifecycle(Lifecycle.State.STARTED) {
-            binding.refreshLayout.finishLoadMore()
+//                activity.netViewModel.seasoningListState.collect { state ->
-        }
+//                    when (state) {
-    }
+//                        is UiState.Success -> loadGoodsList(state.data)
-
+//                        is UiState.Error -> {
-    fun getTextSpan(weight: Double): SpannableStringBuilder {
+//                            activity.toast(state.msg)
-        var topWeight = "$weight"
+//                            finishRefresh()
-        var bottomUnit = "克"
+//                        }
-        if (weight >= 1000) {
+//                        else -> {}
-            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 ->
+//    private fun searchGoods(v: View) {
-                    fm.descent += 10.dp // 增加行间距
+//        if (goodsName.isNullOrBlank()) {
-                }
+//            activity.toast("请${binding.etSheetInput.hint}")
-            )
+//            return
-            append("\n")
+//        }
-            appendText(
+//        pageNo = 1
-                bottomUnit,
+//        getGoodsList()
-                ForegroundColorSpan("#999999".toColorInt()),
+//        KeyboardUtil.hideKeyboard(v)
-                AbsoluteSizeSpan(30, true)
+//    }
-            )
+//
-        }
+//    /**
-    }
+//     * 请求调料列表
-}
+//     */
-
+//    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)
+//            )
+//        }
+//    }
+//}

app/src/main/java/com/shuwei/dish/match/dialog/SeasoningSelectDialog.kt

@@ -0,0 +1,256 @@
+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.KeyboardShortcutGroup
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
+import android.view.Window
+import android.view.WindowManager
+import android.widget.FrameLayout
+import androidx.core.widget.addTextChangedListener
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
+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.databinding.LayoutEmptyViewBinding
+import com.shuwei.dish.match.entity.GoodsItem
+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.Job
+import kotlinx.coroutines.launch
+
+/**
+ * 调料选择弹窗，不含重量显示，继承 BottomSheetDialog 确保只初始化一次
+ * @param activity 宿主 Activity
+ * @param onItemSelected 用户点击某一调料时的回调
+ */
+class SeasoningSelectDialog(
+    private val activity: BaseActivity,
+    private val onItemSelected: (item: GoodsItem) -> Unit
+) : BottomSheetDialog(activity, R.style.BottomSheet) {
+
+    companion object {
+        const val TAG = "SeasoningSelectDialog"
+        const val PAGE_SIZE = 50
+    }
+
+    private val binding = DialogSeasoningSelectBinding.inflate(LayoutInflater.from(activity))
+    private val list = mutableListOf<GoodsItem>()
+    private val adapter = SeasoningSearchAdapter(list).apply {
+        isStateViewEnable = true
+        setOnItemClickListener { _, v, position ->
+            list[position].isClicked = true
+            notifyItemChanged(position)
+            v.postDelayed({
+                onItemSelected(list[position])
+                dismiss()
+            }, 300)
+        }
+    }
+
+    private var goodsName: String? = null
+    private var pageNo = 1
+    private var collectJob: Job? = null
+
+    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 {
+            collectJob?.cancel()
+            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()
+        // 启动 StateFlow 收集，弹窗关闭时由 setOnDismissListener 取消
+        collectJob = activity.lifecycleScope.launch {
+            activity.netViewModel.goodsListState.collect { state ->
+                when (state) {
+                    is UiState.Loading -> {}
+                    is UiState.Success -> loadGoodsList(state.data)
+                    is UiState.Error -> {
+                        activity.toast(state.msg)
+                        finishRefresh()
+                        if (pageNo == 1) {
+                            loadEmptyView()
+                        }
+                    }
+                    is UiState.Idle -> {}
+                }
+            }
+        }
+        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)
+            }
+
+            override fun onPointerCaptureChanged(hasCapture: Boolean) {
+                originalCallback.onPointerCaptureChanged(hasCapture)
+            }
+
+            override fun onProvideKeyboardShortcuts(
+                data: List<KeyboardShortcutGroup?>?,
+                menu: Menu?,
+                deviceId: Int
+            ) {
+                originalCallback.onProvideKeyboardShortcuts(data, menu, deviceId)
+            }
+        }
+    }
+
+    /**
+     * 触发搜索：校验输入、隐藏键盘、发起请求
+     */
+    private fun searchGoods(v: View) {
+        if (goodsName.isNullOrBlank()) {
+            activity.toast("请${binding.etSheetInput.hint}")
+            return
+        }
+        pageNo = 1
+        getGoodsList()
+        KeyboardUtil.hideKeyboard( v)
+    }
+
+    /**
+     * 请求调料列表
+     */
+    private fun getGoodsList() {
+        activity.netViewModel.queryGoodsList(
+            goodsType = "1",
+            pageNum = pageNo,
+            pageSize = PAGE_SIZE,
+            goodsName = goodsName.takeUnless { it.isNullOrBlank() }
+        )
+    }
+
+    /**
+     * 将返回数据转换并填充到列表
+     */
+    @SuppressLint("NotifyDataSetChanged")
+    private fun loadGoodsList(records: MutableList<GoodsItem>?) {
+        finishRefresh()
+        if (records.isNullOrEmpty()) {
+            //activity.toast("暂未搜索到调料信息")
+            if (pageNo == 1) {
+                loadEmptyView()
+            }
+            return
+        }
+        binding.recyclerView.layoutManager = GridLayoutManager(activity, 3, GridLayoutManager.VERTICAL, false)
+        if (pageNo == 1) list.clear()
+        list.addAll(records)
+        adapter.notifyDataSetChanged()
+        val isLoadMoreEnable = records.size >= PAGE_SIZE
+        binding.refreshLayout.setEnableLoadMore(isLoadMoreEnable)
+        if (isLoadMoreEnable) pageNo++
+    }
+
+    private fun finishRefresh() {
+        if (pageNo == 1) binding.refreshLayout.finishRefresh()
+        else binding.refreshLayout.finishLoadMore()
+    }
+
+
+    private var emptyViewBinding: LayoutEmptyViewBinding? = null
+
+    @SuppressLint("NotifyDataSetChanged")
+    private fun loadEmptyView() {
+        try {
+            binding.refreshLayout.setEnableRefresh(true)
+            binding.refreshLayout.setEnableLoadMore(false)
+            list.clear()
+            adapter.notifyDataSetChanged()
+            if (emptyViewBinding == null) {
+                emptyViewBinding = LayoutEmptyViewBinding.inflate(
+                    LayoutInflater.from(activity),
+                    binding.recyclerView,
+                    false
+                )
+            }
+            emptyViewBinding!!.tvContent.text = "暂无数据"
+            emptyViewBinding!!.tvSubContent.text = "未查询到调料信息，请联系管理员添加"
+            emptyViewBinding!!.root.layoutParams = FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.MATCH_PARENT,
+                FrameLayout.LayoutParams.MATCH_PARENT
+            )
+            binding.recyclerView.layoutManager = LinearLayoutManager(activity)
+            binding.recyclerView.post {
+                emptyViewBinding!!.root.minimumHeight = binding.recyclerView.height
+                adapter.stateView = emptyViewBinding!!.root
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+}

app/src/main/java/com/shuwei/dish/match/entity/CollectedFoodItem.kt

@@ -0,0 +1,11 @@
+package com.shuwei.dish.match.entity
+
+/**
+ * 已采集食材列表项数据模型
+ * @param foodName 食材名称
+ * @param collectCount 已采集数量
+ */
+data class CollectedFoodItem(
+    val foodName: String = "",
+    val collectCount: Int = 0
+)

app/src/main/java/com/shuwei/dish/match/entity/CookFoodEntity.kt

@@ -21,8 +21,8 @@ data class CookFoodEntity(
     var createTime: String = DateTimeUtil.formatDateTime(LocalDateTime.now()),
     var dinnerType: String? = "0",
 ) : BaseEntity {
-    @Ignore
+//    @Ignore
-    var stFoodInfoConstituteList: MutableList<CookFoodGoodsEntity>? = null
+//    var stFoodInfoConstituteList: MutableList<CookFoodGoodsEntity>? = null
     @Ignore
     var matchingConstituteInfoList: MutableList<CookFoodGoodsEntity>? = null
     @Ignore

app/src/main/java/com/shuwei/dish/match/entity/CookFoodGoodsEntity.kt

@@ -1,7 +1,6 @@
 package com.shuwei.dish.match.entity
 
 import androidx.room.Entity
-import androidx.room.Ignore
 import androidx.room.PrimaryKey
 import com.shuwei.dish.match.db.BaseEntity
 import com.shuwei.dish.match.utils.DateTimeUtil
@@ -63,27 +62,28 @@ class CookFoodGoodsEntity(
 
     var relateionType_dictText: String? = "",
 
+    var zjmCode: String? = "",
+
+    var materId: String? = "",
+
     var isDel: Int = 0,
     var createTime: String = DateTimeUtil.formatDateTime(LocalDateTime.now())
 ) : BaseEntity, Serializable {
-    constructor() : this(goodsId = "") // 必需的空构造,
+    constructor() : this(goodsId = "") // 必需的空构造
 
-    @Ignore
+    /**
-    var isSetFinished: Boolean = false
+     * 转换为 GoodsItem，用于 UI 层（DishPartAdapter、PrepareFoodActivity 等）
-
+     */
-    @Ignore
+    fun toGoodsItem(): GoodsItem = GoodsItem(
-    var isItemClicked: Boolean = false
+        goodsId = goodsId,
-
+        goodsName = goodsName,
-    @Ignore
+        popularName = popularName,
-    var isSamplingPage: Boolean = false
+        zjmCode = zjmCode,
-
+        materId = materId,
-    @Ignore
+        materialType = materialType,
-    var isNewDishType: Boolean = false
+        useWeight = useWeight,
-
+        relateionType = relateionType,
-    @Ignore
+        allEdible = allEdible,
-    var isClicked: Boolean = false
+        goodsOrRelationCode = goodsOrRelationCode
-
+    )
-    //true-原始数据，false-非原始数据
-    @Ignore
-    var isOriginalData: Boolean = true
 }

app/src/main/java/com/shuwei/dish/match/entity/DataBean.kt

@@ -1,7 +1,10 @@
 package com.shuwei.dish.match.entity
 
-data class HomeModeBean(
+import android.graphics.Bitmap
+import android.net.Uri
+import java.io.File
 
+data class HomeModeBean(
     var modeName: String = "",
     var modeDesc: String = "",
     var modeIconId: Int = 0,
@@ -10,53 +13,42 @@ data class HomeModeBean(
     var onClick: (() -> Unit)? = null
 )
 
-data class FoodRecordBean(
+data class FoodCollectionBean(
-    var records: MutableList<FoodRecord>? = null,
+    var imageUri: Uri? = null,
-    var total: Int,
+    var bitmap: Bitmap? = null,
-    var size: Int,
+    var imageFile: File? = null,
-    var current: Int,
+    var imageVector: FloatArray? = null,
-    var page: Int
+    var isShowCamera: Boolean = false,
-)
+    var isFinish:Boolean = false,
+    var uploadSuccess:Boolean = false
+) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
 
-data class GoodsRecordBean(
+        other as FoodCollectionBean
-    var records: MutableList<CookFoodGoodsEntity>? = null,
-    var total: Int,
-    var size: Int,
-    var current: Int,
-    var page: Int
-)
 
-data class SeasoningRecordBean(
+        if (isShowCamera != other.isShowCamera) return false
-    var records: MutableList<SeasoningEntity>? = null,
+        if (isFinish != other.isFinish) return false
-    var total: Int,
+        if (uploadSuccess != other.uploadSuccess) return false
-    var size: Int,
+        if (imageUri != other.imageUri) return false
-    var current: Int,
+        if (bitmap != other.bitmap) return false
-    var page: Int
+        if (imageFile != other.imageFile) return false
-)
+        if (!imageVector.contentEquals(other.imageVector)) return false
 
-data class ResetReasoningRecord(
+        return true
-    val list: MutableList<SeasoningEntity>
+    }
-)
 
-//data class DishDetailEntity(
+    override fun hashCode(): Int {
-//    var foodId: String? = null,
+        var result = isShowCamera.hashCode()
-//    var foodWeight: Double? = null,
+        result = 31 * result + isFinish.hashCode()
-//    var foodRealWeight: Double? = null,
+        result = 31 * result + uploadSuccess.hashCode()
-//    var voList: List<DishPartEntity>? = null
+        result = 31 * result + (imageUri?.hashCode() ?: 0)
-//)
+        result = 31 * result + (bitmap?.hashCode() ?: 0)
-
+        result = 31 * result + (imageFile?.hashCode() ?: 0)
-//data class DishPartEntity(
+        result = 31 * result + (imageVector?.contentHashCode() ?: 0)
-//    var foodId: String? = null,
+        return result
-//    var foodName: String? = null,
+    }
-//    var foodWeight: Int? = null,
+}
-//    var useWeight: Int? = null,
-//    var useRealWeight: Int? = null,
-//    var goodsId: Int? = null,
-//    var goodsName: String? = null,
-//    var materialType: Int? = null,
-//    var isSetFinished: Boolean = false,
-//    var isItemClicked: Boolean = false,
-//    var isSamplingPage: Boolean = false
-//)
 
 

app/src/main/java/com/shuwei/dish/match/entity/DishEntity.kt

@@ -1,25 +0,0 @@
-package com.shuwei.dish.match.entity
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import com.shuwei.dish.match.db.BaseEntity
-
-//@Entity(tableName = "dm_dish")
-//data class DishEntity (
-//    /**
-//     * 菜品id
-//     */
-//    @PrimaryKey var id: Long,
-//    /**
-//     * 菜品名称
-//     */
-//    var name: String? = "",
-//    /**
-//     * 菜品重量
-//     */
-//    var weight: Int? = 0,
-//
-//    var sort: Int = 0,
-//    @ColumnInfo(name = "create_time") val createTime: Long = System.currentTimeMillis()
-//): BaseEntity

app/src/main/java/com/shuwei/dish/match/entity/GoodsInfoEntity.kt

@@ -1,38 +0,0 @@
-//package com.shuwei.dish.match.entity
-//
-//import androidx.room.Ignore
-//import androidx.room.PrimaryKey
-//import com.shuwei.dish.match.db.BaseEntity
-//
-//data class GoodsInfoEntity(
-//    @PrimaryKey(autoGenerate = true) var id: Long = 0,
-//    var goodsId: Int,
-//    var goodsName: String? = "",
-//    var popularName: String? = "",
-//    var canteenId: String? = "",
-//    var goodsOrRelationCode: String? = "",
-//    var relateionType: Int? = -1,
-//    var relateionType_dictText: String? = "",
-//
-//    var sort: Int = 0,
-//
-//    var swMaterBaseMaterial: String? = "",
-//    var preMaterClass: String? = "",
-//    var preUseWeight: Int? = 0,
-//    var preWeight: Int? = 0,
-//    var oil: String? = "",
-//    var sugar: String? = "",
-//    /**
-//     * isDel表示数据是否已删除，1-已删除，为无效数据，0-正常使用，有效数据
-//     */
-//    var isDel: Int = 0,
-//    val createTime: Long = System.currentTimeMillis()
-//) : BaseEntity {
-//    @Ignore
-//    var pageType: Int = 0
-//
-//    @Ignore
-//    var isClicked: Boolean = false
-//
-//    constructor() : this(id = -1, goodsId = -1) // 必需的空构造
-//}

app/src/main/java/com/shuwei/dish/match/entity/GoodsItem.kt

@@ -0,0 +1,66 @@
+package com.shuwei.dish.match.entity
+
+import java.io.Serializable
+
+/**
+ * 物品信息接口返回的数据类（DTO），不依赖 Room，同时承载 UI 状态字段
+ * 对应接口：queryGoodsInfoList，食材（goodsType=0）和调料（goodsType=1）共用此结构
+ */
+data class GoodsItem(
+    // 接口返回字段
+    val goodsId: String = "",
+    val goodsName: String? = null,
+    val popularName: String? = null,
+    val zjmCode: String? = null,
+    val materId: String? = null,
+
+    // 从 CookFoodGoodsEntity 迁移的数据字段（DishPartAdapter 显示及转换用）
+    var materialType: Int = 0,
+    var useWeight: Double? = 0.0,
+    var relateionType: Int = 0,
+    var allEdible: Boolean = true,
+    var goodsOrRelationCode: String? = "",
+
+    // 从 CookFoodGoodsEntity @Ignore 迁移的 UI 状态字段
+    var isSetFinished: Boolean = false,
+    var isItemClicked: Boolean = false,
+    var isSamplingPage: Boolean = false,
+    var isNewDishType: Boolean = false,
+    var isClicked: Boolean = false,
+    // true-原始数据，false-非原始数据（识图新增）
+    var isOriginalData: Boolean = true,
+    // 识图匹配分数，-1 表示不显示
+    var foodScore: Int = -1
+) : Serializable {
+
+    /**
+     * 转换为 CookFoodGoodsEntity，用于写入数据库或传给 SubmitFoodActivity
+     */
+    fun toCookFoodGoodsEntity(): CookFoodGoodsEntity = CookFoodGoodsEntity(
+        goodsId = goodsId,
+        goodsName = goodsName,
+        popularName = popularName,
+        zjmCode = zjmCode,
+        materId = materId,
+        materialType = materialType,
+        useWeight = useWeight,
+        relateionType = relateionType,
+        allEdible = allEdible,
+        goodsOrRelationCode = goodsOrRelationCode
+    )
+
+    /**
+     * 转换为 SeasoningEntity，用于保存调料完整信息到 dm_seasoning
+     */
+    fun toSeasoningEntity(): SeasoningEntity = SeasoningEntity(
+        goodsId = goodsId,
+        goodsName = goodsName,
+        popularName = popularName,
+        zjmCode = zjmCode,
+        materId = materId,
+        materialType = materialType,
+        relateionType = relateionType,
+        allEdible = allEdible,
+        goodsOrRelationCode = goodsOrRelationCode
+    )
+}

app/src/main/java/com/shuwei/dish/match/entity/SeasoningEntity.kt

@@ -1,7 +1,6 @@
 package com.shuwei.dish.match.entity
 
 import androidx.room.Entity
-import androidx.room.Ignore
 import androidx.room.PrimaryKey
 import com.shuwei.dish.match.db.BaseEntity
 import com.shuwei.dish.match.utils.DateTimeUtil
@@ -55,6 +54,10 @@ data class SeasoningEntity(
 
     var relateionType_dictText: String? = "",
 
+    var zjmCode: String? = "",
+
+    var materId: String? = "",
+
     var sort: Int = 9999,
     /**
     * isDel表示数据是否已删除，1-已删除，为无效数据，0-正常使用，有效数据
@@ -62,11 +65,5 @@ data class SeasoningEntity(
 var isDel: Int = 0,
     var createTime: String = DateTimeUtil.formatDateTime(LocalDateTime.now())
 ) : BaseEntity {
-    @Ignore
-    var pageType: Int = 0
-
-    @Ignore
-    var isClicked: Boolean = false
-
     constructor() : this(goodsId = "") // 必需的空构造
 }

app/src/main/java/com/shuwei/dish/match/entity/SeasoningSlotEntity.kt

@@ -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
+)

app/src/main/java/com/shuwei/dish/match/http/HttpClient.kt

@@ -1,70 +0,0 @@
-//package com.shuwei.dish.match.http
-//
-//import android.annotation.SuppressLint
-//import android.util.Log
-//import okhttp3.Call
-//import okhttp3.Interceptor
-//import okhttp3.OkHttpClient
-//import okhttp3.Request
-//import okhttp3.Response
-//import java.util.concurrent.TimeUnit
-//
-//import javax.net.ssl.*
-//import java.security.SecureRandom
-//import java.security.cert.X509Certificate
-//
-//class HttpClient private constructor() {
-//    private val client: OkHttpClient by lazy {
-//        OkHttpClient.Builder()
-//            .apply {
-//                connectTimeout(15, TimeUnit.SECONDS)
-//                readTimeout(30, TimeUnit.SECONDS)
-//                writeTimeout(15, TimeUnit.SECONDS)
-//                sslSocketFactory(createSSLSocketFactory(), TrustAllCerts())
-//                hostnameVerifier { _, _ -> true }
-//                //if (BuildConfig.Debug) {
-//                    addInterceptor(LoggingInterceptor())
-//               //   }
-//            }
-//            .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
-//        }
-//    }
-//
-//    // 信任所有证书的TrustManager实现
-//    @SuppressLint("CustomX509TrustManager")
-//    class TrustAllCerts : X509TrustManager {
-//        @SuppressLint("TrustAllX509TrustManager")
-//        override fun checkClientTrusted(chain: Array<X509Certificate>, authType: String) {}
-//        @SuppressLint("TrustAllX509TrustManager")
-//        override fun checkServerTrusted(chain: Array<X509Certificate>, authType: String) {}
-//        override fun getAcceptedIssuers(): Array<X509Certificate> = arrayOf()
-//    }
-//
-//    // 创建信任所有证书的SSLSocketFactory
-//    fun createSSLSocketFactory(): SSLSocketFactory {
-//        val sslContext = SSLContext.getInstance("TLS").apply {
-//            init(null, arrayOf(TrustAllCerts()), SecureRandom())
-//        }
-//        return sslContext.socketFactory
-//    }
-//
-//}

app/src/main/java/com/shuwei/dish/match/http/HttpUtil.kt

@@ -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://")

app/src/main/java/com/shuwei/dish/match/http/UrlConfig.kt

@@ -1,37 +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 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"
-
-}

app/src/main/java/com/shuwei/dish/match/net/ApiRequest.kt

@@ -1,5 +1,6 @@
 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
@@ -46,6 +47,7 @@ import java.net.UnknownHostException
  * @param onSuccess 成功回调
  * @param onFailure 自定义错误回调（可选，不传则用默认提示）
  */
+@Suppress("UNCHECKED_CAST")
 suspend fun <T> request(
     onRequest: suspend () -> ApiResponse<T>,
     onSuccess: (T) -> Unit,
@@ -60,10 +62,10 @@ suspend fun <T> request(
         onFailure("-1", apiException.errorMsg)
         return
     }
-    if (response?.isSuccess() == true) {
+    if (response.isSuccess()) {
         onSuccess(response.data as T)
     } else {
-        onFailure(response?.code ?: "-1", response?.msg ?: "")
+        onFailure(response.code, response.msg ?: "")
     }
 }
 
@@ -72,11 +74,17 @@ data class CodeMsg(
     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 = "网络未连接，请检查网络"
@@ -108,10 +116,15 @@ fun getApiException(e: Exception): ApiException {
 
 fun httpException2ApiException(e: HttpException): ApiException {
     val body = e.response()?.errorBody()?.string()
-    val codeMsg: CodeMsg? = body?.toObject<CodeMsg>()
+    val codeMsg: CodeMsg? = try {
+        body?.toObject<CodeMsg>()
+    } catch (_: Exception) {
+        null
+    }
     return ApiException(
         ErrorType.NETWORK_ERROR,
-        errorMsg = codeMsg?.msg ?: ""
+        errorMsg = if (codeMsg == null) "数据解析异常(${e.code()})"
+                   else codeMsg.msg ?: "服务器错误(${e.code()})"
     )
 }
 

app/src/main/java/com/shuwei/dish/match/net/ApiService.kt

@@ -2,9 +2,8 @@ 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 com.shuwei.dish.match.entity.GoodsItem
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
@@ -51,63 +50,12 @@ interface ApiService {
     ): ApiResponse<MutableList<FoodRecord>?>
 
     /**
-     * 物品信息
+     * 物品信息（食材 goodsType=0，调料 goodsType=1 共用此接口）
      */
     @POST
     suspend fun queryGoodsList(
         @Url url:String = "${GlobalData.appBaseUrl}/terminal/neglect/matching/app/queryGoodsInfoList",
         @Body param: MutableMap<String, Any>
-    ): ApiResponse<MutableList<CookFoodGoodsEntity>?>
+    ): ApiResponse<MutableList<GoodsItem>?>
-
-    /**
-     * 调料信息
-     */
-    @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?>
 
 }

app/src/main/java/com/shuwei/dish/match/net/HttpManager.kt

@@ -2,7 +2,7 @@ package com.shuwei.dish.match.net
 
 import android.annotation.SuppressLint
 import android.util.Log
-import com.shuwei.dish.match.http.UrlConfig
+import com.shuwei.dish.match.base.GlobalData
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
@@ -16,7 +16,7 @@ import kotlin.apply
 import kotlin.jvm.java
 
 val apiService: ApiService = Retrofit.Builder()
-    .baseUrl(UrlConfig.BASE_URL)
+    .baseUrl(GlobalData.appBaseUrl)
 //    .baseUrl(UrlConfig.DEVICE_BASE_URL)
     .client(HttpManager.instance.client)
     .addConverterFactory(GsonConverterFactory.create())

app/src/main/java/com/shuwei/dish/match/net/NetViewModel.kt

@@ -2,110 +2,124 @@ package com.shuwei.dish.match.net
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.shuwei.dish.match.base.BaseApp
 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.entity.GoodsItem
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 
-class NetViewModel : ViewModel() {
+/**
+ * 网络请求 ViewModel，所有网络操作通过 RemoteRepository 发起，不直接依赖 apiService
+ * @param repository 网络数据仓库，默认使用单例实例
+ */
+class NetViewModel(
+    private val repository: RemoteRepository = RemoteRepository()
+) : ViewModel() {
 
-    fun submitCookFood(
+    /**
-        entity: CookFoodEntity,
+     * 提交制作菜品的 UI 状态流，UI 层通过 collect 监听
-        onSuccess: (Any?) -> Unit,
+     */
-        onFailure: (String, String) -> Unit
+    private val _submitCookFoodState = MutableStateFlow<UiState<Any?>>(UiState.Idle)
-    ) {
+    val submitCookFoodState: StateFlow<UiState<Any?>> = _submitCookFoodState.asStateFlow()
+
+    /**
+     * 提交制作菜品
+     */
+    fun submitCookFood(entity: CookFoodEntity) {
         viewModelScope.launch {
-            request(
+            _submitCookFoodState.value = UiState.Loading
-                onRequest = {
+            _submitCookFoodState.value = repository.submitCookFood(entity)
-                    apiService.submitCookFood(param = entity)
-                },
-                onSuccess = onSuccess,
-                onFailure = onFailure
-            )
         }
     }
 
-    fun getFoodDetail(
+    /**
-        foodId: String,
+     * 查询菜品详情的 UI 状态流，UI 层通过 collect 监听
-        onSuccess: (CookFoodEntity?) -> Unit,
+     */
-        onFailure: (String, String) -> Unit
+    private val _foodDetailState = MutableStateFlow<UiState<CookFoodEntity?>>(UiState.Idle)
-    ) {
+    val foodDetailState: StateFlow<UiState<CookFoodEntity?>> = _foodDetailState.asStateFlow()
+
+    /**
+     * 查询菜品详情
+     */
+    fun getFoodDetail(foodId: String) {
         viewModelScope.launch {
-            request(
+            _foodDetailState.value = UiState.Loading
-                onRequest = {
+            _foodDetailState.value = repository.getFoodDetail(foodId)
-                    apiService.getFoodDetail(foodId = foodId)
-                },
-                onSuccess = onSuccess,
-                onFailure = onFailure
-            )
         }
     }
 
+    /**
+     * 搜索菜品列表的 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>,
+     * 搜索菜品列表
-        onSuccess: (MutableList<FoodRecord>?) -> Unit,
+     */
-        onFailure: (String, String) -> Unit
+    fun searchFoodList(param: MutableMap<String, Any>) {
-    ) {
         viewModelScope.launch {
-            request(
+            _searchFoodState.value = UiState.Loading
-                onRequest = {
+            _searchFoodState.value = repository.searchFoodList(param)
-                    apiService.searchFoodList(param = param)
-                },
-                onSuccess = onSuccess,
-                onFailure = onFailure
-            )
         }
     }
 
-    fun getSamplingList(
+    /**
-        param: MutableMap<String, Any>,
+     * 查询采样数据列表的 UI 状态流，UI 层通过 collect 监听
-        onSuccess: (MutableList<FoodRecord>?) -> Unit,
+     */
-        onFailure: (String, String) -> Unit
+    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 {
-            request(
+            _samplingListState.value = UiState.Loading
-                onRequest = {
+            _samplingListState.value = repository.getSamplingList(param)
-                    apiService.getSamplingList(param = param)
-                },
-                onSuccess = onSuccess,
-                onFailure = onFailure
-            )
         }
     }
 
+    /**
+     * 查询物品信息列表的 UI 状态流（食材/调料共用），UI 层通过 collect 监听
+     */
+    private val _goodsListState = MutableStateFlow<UiState<MutableList<GoodsItem>?>>(UiState.Idle)
+    val goodsListState: StateFlow<UiState<MutableList<GoodsItem>?>> = _goodsListState.asStateFlow()
+
+    /**
+     * 查询物品信息列表（食材 goodsType=0，调料 goodsType=1 共用）
+     * @param goodsType 物品类型：0=食材，1=调料
+     * @param placeId 场所 ID，默认取当前食堂 ID
+     * @param pageNum 页码，默认第 1 页
+     * @param pageSize 每页条数，默认 50
+     * @param goodsName 按名称模糊搜索，为 null 时不传该字段
+     * @param goodsNames 按名称列表批量查询，为 null 时不传该字段
+     */
     fun queryGoodsList(
-        param: MutableMap<String, Any>,
+        goodsType: String,
-        onSuccess: (MutableList<CookFoodGoodsEntity>?) -> Unit,
+        placeId: String = BaseApp.canteenId,
-        onFailure: (String, String) -> Unit
+        pageNum: Int = 1,
+        pageSize: Int = 50,
+        goodsName: String? = null,
+        goodsNames: List<String>? = null
     ) {
+        val param = mutableMapOf<String, Any>(
+            "goodsType" to goodsType,
+            "placeId" to placeId,
+            "pageNum" to pageNum,
+            "pageSize" to pageSize
+        )
+        goodsName?.let { param["goodsName"] = it }
+        goodsNames?.let { param["goodsNames"] = it }
         viewModelScope.launch {
-            request(
+            _goodsListState.value = UiState.Loading
-                onRequest = {
+            _goodsListState.value = repository.queryGoodsList(param)
-                    apiService.queryGoodsList(param = param)
-                },
-                onSuccess = onSuccess,
-                onFailure = onFailure
-            )
         }
     }
-
-    fun querySeasoningList(
-        param: MutableMap<String, Any>,
-        onSuccess: (MutableList<SeasoningEntity>?) -> Unit,
-        onFailure: (String, String) -> Unit
-    ) {
-        viewModelScope.launch {
-            request(
-                onRequest = {
-                    apiService.querySeasoningList(param = param)
-                },
-                onSuccess = onSuccess,
-                onFailure = onFailure
-            )
-        }
-    }
-
-
 }

app/src/main/java/com/shuwei/dish/match/net/RemoteRepository.kt

@@ -0,0 +1,93 @@
+package com.shuwei.dish.match.net
+
+import com.shuwei.dish.match.entity.CookFoodEntity
+import com.shuwei.dish.match.entity.FoodRecord
+import com.shuwei.dish.match.entity.GoodsItem
+
+/**
+ * 网络数据仓库，封装所有 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)
+        }
+    }
+
+    /**
+     * 查询物品信息列表（食材 goodsType=0，调料 goodsType=1 共用）
+     * @param param 查询参数
+     * @return UiState 包装的结果，Success 携带列表数据，Error 携带错误信息
+     */
+    suspend fun queryGoodsList(param: MutableMap<String, Any>): UiState<MutableList<GoodsItem>?> {
+        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)
+        }
+    }
+
+}

app/src/main/java/com/shuwei/dish/match/net/UiState.kt

@@ -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>()
+}

app/src/main/java/com/shuwei/dish/match/objbox/Food.kt

@@ -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
+    }
+}

app/src/main/java/com/shuwei/dish/match/objbox/FoodClassInfo.kt

@@ -0,0 +1,12 @@
+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>
+)
+

app/src/main/java/com/shuwei/dish/match/objbox/FoodModule.kt

@@ -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)
+    }
+
+}

app/src/main/java/com/shuwei/dish/match/objbox/ObjectBox.kt

@@ -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
+    }
+
+}

app/src/main/java/com/shuwei/dish/match/scale/MdnsDiscoveryManager.kt

@@ -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
+        }
+    }
+}

app/src/main/java/com/shuwei/dish/match/scale/MdnsRegisterManager.kt

@@ -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
+    }
+}

app/src/main/java/com/shuwei/dish/match/scale/ScaleCommand.kt

@@ -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"
+    }
+}

app/src/main/java/com/shuwei/dish/match/scale/ScaleData.kt

@@ -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
+)

app/src/main/java/com/shuwei/dish/match/scale/ScaleDataAggregator.kt

@@ -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)
+    }
+}

app/src/main/java/com/shuwei/dish/match/scale/ScaleDeviceConfig.kt

@@ -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)
+}

app/src/main/java/com/shuwei/dish/match/scale/ScaleEvent.kt

@@ -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"
+    }
+}

app/src/main/java/com/shuwei/dish/match/scale/ScaleServiceManager.kt

@@ -0,0 +1,248 @@
+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 的兜底发现机制；每次广播时动态获取 IP，避免启动时网络未就绪导致 IP 为空
+            udpSender = UdpBroadcastSender(deviceId = deviceId, ipProvider = { getLocalIp(context) }).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)
+                // 清除 UDP 缓存，确保子设备下次广播时能重新触发 onDeviceFound，立即重连而非等待指数退避
+                udpReceiver?.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, "所有秤服务已停止")
+    }
+}

app/src/main/java/com/shuwei/dish/match/scale/ScaleWebSocketClient.kt

@@ -0,0 +1,204 @@
+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() 后已入队的任务不执行，但新断线事件始终能进入重连流程
+     * scheduler 已关闭（shutdown 后）时直接跳过，避免 RejectedExecutionException
+     */
+    private fun scheduleReconnect(deviceId: String, host: String, port: Int) {
+        if (scheduler.isShutdown) return
+        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 已关闭")
+    }
+}

app/src/main/java/com/shuwei/dish/match/scale/ScaleWebSocketServer.kt

@@ -0,0 +1,183 @@
+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)) {
+
+        /** 当前活跃连接计数，用于替代 connections.isNullOrEmpty() 避免竞态 */
+        private var connectionCount = 0
+
+        override fun onOpen(conn: WebSocket, handshake: ClientHandshake) {
+            connectionCount++
+            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")
+            // 用计数器判断是否还有活跃连接，避免依赖 connections 集合的移除时机导致竞态
+            if (--connectionCount <= 0) {
+                connectionCount = 0
+                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
+        }
+    }
+}

app/src/main/java/com/shuwei/dish/match/scale/UdpBroadcastReceiver.kt

@@ -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 广播接收已停止")
+    }
+}

app/src/main/java/com/shuwei/dish/match/scale/UdpBroadcastSender.kt

@@ -0,0 +1,84 @@
+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 的兜底发现机制，确保主设备能可靠发现子设备
+ *
+ * @param ipProvider 动态获取本机 IP 的函数，每次广播时调用；返回空字符串时跳过本次广播
+ */
+class UdpBroadcastSender(
+    private val deviceId: String,
+    private val ipProvider: () -> 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, port=$wsPort")
+    }
+
+    private fun sendBroadcast() {
+        try {
+            val ip = ipProvider()
+            // 网络未就绪时跳过本次广播，等待下一个周期重试
+            if (ip.isEmpty()) {
+                Log.d(TAG, "IP 未就绪，跳过本次广播")
+                return
+            }
+            val payload = gson.toJson(Payload(deviceId, ip, 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 广播已停止")
+    }
+}

app/src/main/java/com/shuwei/dish/match/ui/CollectedFoodActivity.kt

@@ -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)
+    }
+}

app/src/main/java/com/shuwei/dish/match/ui/CookingModeActivity.kt

@@ -1,32 +1,26 @@
 package com.shuwei.dish.match.ui
 
-import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
-import androidx.activity.viewModels
+import androidx.activity.addCallback
-import androidx.lifecycle.ViewModelProvider
+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.ActivityCookingModeBinding
-import com.shuwei.dish.match.databinding.ActivitySelectDishBinding
+import com.shuwei.dish.match.dialog.CommonDialog
-import com.shuwei.dish.match.db.AppRepository
+import com.shuwei.dish.match.ui.fragment.FoodListFragment
-import com.shuwei.dish.match.dialog.DialogTool
-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.net.NetViewModel
-import com.shuwei.dish.match.ui.fragment.DishListFragment
 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.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 kotlin.getValue
 
-class SelectDishActivity : BaseActivity() {
+/**
+ * 制作模式
+ */
+class CookingModeActivity : BaseActivity() {
 
     companion object {
         const val IS_COOKING = "isCooking"
@@ -34,21 +28,18 @@ class SelectDishActivity : BaseActivity() {
         const val IS_CONFIG_PAGE = "isConfigPage"
     }
 
-    private lateinit var binding: ActivitySelectDishBinding
+    private val binding by lazy { ActivityCookingModeBinding.inflate(layoutInflater) }
-
-    private lateinit var appViewModel: AppViewModel
 
     private var dinnerType: String = "1"
 
-    private val fragmentList = mutableListOf<DishListFragment>().apply {
+    private val fragmentList = mutableListOf<FoodListFragment>().apply {
-        add(DishListFragment.instance("1"))
+        add(FoodListFragment.instance("1"))
-        add(DishListFragment.instance("2"))
+        add(FoodListFragment.instance("2"))
-        add(DishListFragment.instance("3"))
+        add(FoodListFragment.instance("3"))
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        binding = ActivitySelectDishBinding.inflate(layoutInflater)
         setContentView(binding.root)
         setHeaderBackground()
         setTitleBar(titleBarAction = {
@@ -59,59 +50,46 @@ class SelectDishActivity : BaseActivity() {
             it.visible()
             it.setImageResource(R.drawable.ic_setting)
             it.setOnClickListener {
-                startActivity<DeviceConfigActivity> {
+                startActivity<SettingActivity>()
-                    putExtra(DeviceConfigActivity.COOK_MODE, 1)
-                }
             }
         }, 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) {
+    fun getCookFoodList() {
-        appViewModel.getCookFoodList(cookMode = 0, dinnerType = dinnerType) { action(it) }
+        appViewModel.getCookFoodList(cookMode = 0, dinnerType = dinnerType)
     }
 
     private var configFinished = false
 
     fun judgeDeviceConfig(block: () -> Unit) {
-        if (configFinished) {
+//        if (configFinished) {
-            block()
+//            block()
-            return
+//            return
-        }
+//        }
-        appViewModel.loadSeasoning {
+//        appViewModel.loadSeasoning {
-            if (it.isEmpty()) {
+//            if (it.isEmpty()) {
-                showDeviceConfigDialog()
+//                showDeviceConfigDialog()
-                return@loadSeasoning
+//                return@loadSeasoning
-            }
+//            }
-            configFinished = true
+//            configFinished = true
-            block()
+//            block()
-        }
+//        }
+        block()
     }
 
     private fun showDeviceConfigDialog() {
-        DialogTool.load(
+        CommonDialog(this)
-            context = this,
+            .setTitle("配置提示")
-            title = "温馨提示",
+            .setContent("请先在设备配置页面进行调料设置")
-            content = "请先在设备配置页面进行调料设置",
+            .setNegativeButton("取消")
-            leftBtnText = "取消",
+            .setPositiveButton("去设置") { startActivity<SettingActivity>() }
-            rightBtnText = "去设置",
+            .show()
-            leftBtnClick = {},
-            rightBtnClick = {
-                startActivity<DeviceConfigActivity> {
-                    putExtra(DeviceConfigActivity.COOK_MODE, 1)
-                }
-            }
-        )
     }
 
     fun addViewListener() {
@@ -143,7 +121,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() {
@@ -164,10 +142,13 @@ 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
@@ -189,14 +170,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()
@@ -208,16 +181,8 @@ class SelectDishActivity : BaseActivity() {
         isVisible = false
     }
 
-    public fun getFoodList(
+    public fun getFoodList(param: MutableMap<String, Any>) {
-        param: MutableMap<String, Any>,
+        netViewModel.searchFoodList(param = param)
-        onSuccess: (MutableList<FoodRecord>?) -> Unit,
-        onFailure: (String, String) -> Unit
-    ) {
-        netViewModel.searchFoodList(
-            param = param,
-            onSuccess = onSuccess,
-            onFailure = onFailure
-        )
     }
 
 }

app/src/main/java/com/shuwei/dish/match/ui/DeviceConfigActivity.kt

@@ -1,353 +1,345 @@
-package com.shuwei.dish.match.ui
+//package com.shuwei.dish.match.ui
-
+//
-import android.graphics.Typeface
+//import android.graphics.Typeface
-import android.os.Bundle
+//import android.os.Bundle
-import android.text.SpannableStringBuilder
+//import android.text.SpannableStringBuilder
-import android.text.style.AbsoluteSizeSpan
+//import android.text.style.AbsoluteSizeSpan
-import android.text.style.ForegroundColorSpan
+//import android.text.style.ForegroundColorSpan
-import android.text.style.LineHeightSpan
+//import android.text.style.LineHeightSpan
-import android.text.style.StyleSpan
+//import android.text.style.StyleSpan
-import android.util.Log
+//import android.util.Log
-import android.util.SparseArray
+//import android.util.SparseArray
-import android.widget.FrameLayout
+//import android.widget.FrameLayout
-import androidx.core.graphics.toColorInt
+//import androidx.core.graphics.toColorInt
-import androidx.core.view.forEach
+//import androidx.core.view.forEach
-import androidx.lifecycle.ViewModelProvider
+//import androidx.lifecycle.ViewModelProvider
-import com.shuwei.dish.match.base.BaseActivity
+//import com.shuwei.dish.match.base.BaseActivity
-import com.shuwei.dish.match.base.BaseApp
+//import com.shuwei.dish.match.base.BaseApp
-import com.shuwei.dish.match.databinding.LayoutFoodRemindBinding
+//import com.shuwei.dish.match.db.DbRepository
-import com.shuwei.dish.match.db.AppRepository
+//import com.shuwei.dish.match.dialog.CommonDialog
-import com.shuwei.dish.match.dialog.CommonDialog
+//import com.shuwei.dish.match.entity.SeasoningEntity
-import com.shuwei.dish.match.entity.SeasoningEntity
+//import com.shuwei.dish.match.entity.ResetReasoningRecord
-import com.shuwei.dish.match.entity.ResetReasoningRecord
+//import com.shuwei.dish.match.utils.AddressUtil
-import com.shuwei.dish.match.utils.AddressUtil
+//import com.shuwei.dish.match.utils.JsonAssetsLoader
-import com.shuwei.dish.match.utils.JsonAssetsLoader
+//import com.shuwei.dish.match.utils.MultiClickDetector
-import com.shuwei.dish.match.utils.MultiClickDetector
+//import com.shuwei.dish.match.utils.WeightUtil
-import com.shuwei.dish.match.utils.WeightUtil
+//import com.shuwei.dish.match.utils.ext.appendText
-import com.shuwei.dish.match.utils.ext.appendText
+//import com.shuwei.dish.match.utils.ext.buildSpannableString
-import com.shuwei.dish.match.utils.ext.buildSpannableString
+//import com.shuwei.dish.match.utils.ext.dp
-import com.shuwei.dish.match.utils.ext.dp
+//import com.shuwei.dish.match.utils.ext.startActivity
-import com.shuwei.dish.match.utils.ext.startActivity
+//import com.shuwei.dish.match.utils.ext.toast
-import com.shuwei.dish.match.utils.ext.toast
+//import com.shuwei.dish.match.utils.ext.visible
-import com.shuwei.dish.match.utils.ext.visible
+//import com.shuwei.dish.match.adapter.TextCellAdapter
-import com.shuwei.dish.match.viewmodel.AppViewModel
+//import com.shuwei.dish.match.databinding.ActivityDeviceConfigBinding
-import com.shuwei.dish.match.viewmodel.factory.AppFactory
+//import com.shuwei.dish.match.dialog.SeasoningSearchDialog
-import com.shuwei.dish.match.adapter.TextCellAdapter
+//import com.shuwei.dish.match.utils.SpTool
-import com.shuwei.dish.match.databinding.ActivityDeviceConfigBinding
+//import com.shuwei.dish.match.utils.ext.clickWithDebounce
-import com.shuwei.dish.match.dialog.SeasoningSearchDialog
+//import com.shuwei.dish.match.utils.ext.gone
-import com.shuwei.dish.match.utils.SpTool
+//import com.shuwei.dish.match.utils.ext.toJsonString
-import com.shuwei.dish.match.utils.ext.clickWithDebounce
+//
-import com.shuwei.dish.match.utils.ext.gone
+//class DeviceConfigActivity : BaseActivity() {
-
+//
-class DeviceConfigActivity : BaseActivity() {
+//    companion object {
-
+//
-    companion object {
+//        const val TAG = "DeviceConfigActivity"
-
+//
-        const val TAG = "DeviceConfigActivity"
+//        const val COOK_MODE = "cookMode"
-
+//
-        const val COOK_MODE = "cookMode"
+//        val modeList = listOf<ModeBean>(
-
+//            ModeBean("制作模式", "菜品快速制作，记录熟重"),
-        val modeList = listOf<ModeBean>(
+//            ModeBean("采样模式", "菜品快速制作，记录熟重"),
-            ModeBean("制作模式", "菜品快速制作，记录熟重"),
+//            ModeBean("品控模式", "菜品快速制作，记录熟重")
-            ModeBean("采样模式", "菜品快速制作，记录熟重"),
+//        )
-            ModeBean("品控模式", "菜品快速制作，记录熟重")
+//    }
-        )
+//
-    }
+//    data class ModeBean(
-
+//        var modeName: String,
-    data class ModeBean(
+//        var modeDesc: String
-        var modeName: String,
+//    )
-        var modeDesc: String
+//
-    )
+//    private lateinit var binding: ActivityDeviceConfigBinding
-
+//
-    private lateinit var binding: ActivityDeviceConfigBinding
+//    private lateinit var appViewModel: DbViewModel
-
+//
-    private lateinit var appViewModel: AppViewModel
+//    private var cookMode: Int = 0
-
+////    private val weightArray = SparseIntArray()
-    private var cookMode: Int = 0
+//    private val weightArray = SparseArray<Double>()
-//    private val weightArray = SparseIntArray()
+//    private val addressArray = AddressUtil.getWeighAddressArray()
-    private val weightArray = SparseArray<Double>()
+//
-    private val addressArray = AddressUtil.getWeighAddressArray()
+//    override fun onCreate(savedInstanceState: Bundle?) {
-
+//        super.onCreate(savedInstanceState)
-    override fun onCreate(savedInstanceState: Bundle?) {
+//        binding = ActivityDeviceConfigBinding.inflate(layoutInflater)
-        super.onCreate(savedInstanceState)
+//        setContentView(binding.root)
-        binding = ActivityDeviceConfigBinding.inflate(layoutInflater)
+//        cookMode = intent.getIntExtra(COOK_MODE, 0)
-        setContentView(binding.root)
+//        initViewModel()
-        cookMode = intent.getIntExtra(COOK_MODE, 0)
+//        setHeaderBackground()
-        initViewModel()
+//        setTitleBar(titleBarAction = {
-        setHeaderBackground()
+//            it.visible()
-        setTitleBar(titleBarAction = {
+//        }, titleAction = {
-            it.visible()
+//            it.text = "设备配置"
-        }, titleAction = {
+//        }, rightIconActon = {
-            it.text = "设备配置"
+//            it.gone()
-        }, rightIconActon = {
+////            it.alpha = 0.0F
-            it.gone()
+////            it.setImageResource(R.drawable.ic_setting)
-//            it.alpha = 0.0F
+////            it.setOnClickListener {_->
-//            it.setImageResource(R.drawable.ic_setting)
+////                detector.setOnDelayedMultiClickListener(it) {
-//            it.setOnClickListener {_->
+////                    defaultDataSettingDialog()
-//                detector.setOnDelayedMultiClickListener(it) {
+////                }
-//                    defaultDataSettingDialog()
+////            }
-//                }
+//        })
+//
+//        loadQualitySpan(isEnable = false)
+//        when (cookMode) {
+//            1 -> {
+//                binding.rbModeCook.isChecked = true
+//                binding.rbModeSampling.isChecked = false
+//                loadCookSpan(isClicked = true)
+//                loadSamplingSpan()
 //            }
-        })
+//
-
+//            2 -> {
-        loadQualitySpan(isEnable = false)
+//                binding.rbModeCook.isChecked = false
-        when (cookMode) {
+//                binding.rbModeSampling.isChecked = true
-            1 -> {
+//                loadCookSpan()
-                binding.rbModeCook.isChecked = true
+//                loadSamplingSpan(isClicked = true)
-                binding.rbModeSampling.isChecked = false
+//            }
-                loadCookSpan(isClicked = true)
+//
-                loadSamplingSpan()
+//            else -> {
-            }
+//                binding.rbModeCook.isChecked = true
-
+//                binding.rbModeSampling.isChecked = false
-            2 -> {
+//                loadCookSpan(isClicked = true)
-                binding.rbModeCook.isChecked = false
+//                loadSamplingSpan()
-                binding.rbModeSampling.isChecked = true
+//            }
-                loadCookSpan()
+//        }
-                loadSamplingSpan(isClicked = true)
+//
-            }
+//        binding.rbModeCook.setOnClickListener {
-
+//            SpTool.put(SpTool.LAUNCH_PAGE_TYPE, 0)
-            else -> {
+//            binding.rbModeCook.isChecked = true
-                binding.rbModeCook.isChecked = true
+//            binding.rbModeSampling.isChecked = false
-                binding.rbModeSampling.isChecked = false
+//            loadCookSpan(isClicked = true)
-                loadCookSpan(isClicked = true)
+//            loadSamplingSpan()
-                loadSamplingSpan()
+//            startActivity<SelectDishActivity> {
-            }
+//                putExtra(SelectDishActivity.IS_CONFIG_PAGE, true)
-        }
+//            }
-
+//            finish()
-        binding.rbModeCook.setOnClickListener {
+//        }
-            SpTool.put(SpTool.LAUNCH_PAGE_TYPE, 0)
+//        binding.rbModeSampling.setOnClickListener {
-            binding.rbModeCook.isChecked = true
+//            SpTool.put(SpTool.LAUNCH_PAGE_TYPE, 1)
-            binding.rbModeSampling.isChecked = false
+//            binding.rbModeCook.isChecked = false
-            loadCookSpan(isClicked = true)
+//            binding.rbModeSampling.isChecked = true
-            loadSamplingSpan()
+//            loadCookSpan()
-            startActivity<SelectDishActivity> {
+//            loadSamplingSpan(isClicked = true)
-                putExtra(SelectDishActivity.IS_CONFIG_PAGE, true)
+//            startActivity<SamplingListActivity> {
-            }
+//                putExtra(SamplingListActivity.IS_CONFIG_PAGE, true) }
-            finish()
+//            finish()
-        }
+//        }
-        binding.rbModeSampling.setOnClickListener {
+//        addWeighListener()
-            SpTool.put(SpTool.LAUNCH_PAGE_TYPE, 1)
+//        addGridItemListener()
-            binding.rbModeCook.isChecked = false
+//        loadSeasoning()
-            binding.rbModeSampling.isChecked = true
+//    }
-            loadCookSpan()
+//
-            loadSamplingSpan(isClicked = true)
+//    private fun addWeighListener() {
-            startActivity<SamplingListActivity> {
+//        WeightUtil.addWeightListener(
-                putExtra(SamplingListActivity.IS_CONFIG_PAGE, true) }
+//            weightKey = TAG,
-            finish()
+//            getWeight = { address, state, weight ->
-        }
+//            Log.d(TAG, "addWeighListener: address=$address,stat=$state,weight=$weight")
-        addWeighListener()
+//            weightArray.put(address, weight)
-        addGridItemListener()
+//            val item = seasoningItems.firstOrNull { address == addressArray[it.sort] }
-        loadSeasoning()
+//            item?.let {
-    }
+//                it.useWeight = weight.toDouble()
-
+//                updateGridData(it)
-    private fun addWeighListener() {
+//            }
-        WeightUtil.addWeightListener(
+//            Log.d(TAG, "addWeighListener: update-----------------------")
-            weightKey = TAG,
+//        })
-            getWeight = { address, state, weight ->
+//    }
-            Log.d(TAG, "addWeighListener: address=$address,stat=$state,weight=$weight")
+//
-            weightArray.put(address, weight)
+//    private var seasoningItems = mutableListOf<SeasoningEntity>()
-            val item = seasoningItems.firstOrNull { address == addressArray[it.sort] }
+//    private fun addGridItemListener() {
-            item?.let {
+//        binding.include.root.forEach { child ->
-                it.useWeight = weight.toDouble()
+//            child.clickWithDebounce {
-                updateGridData(it)
+//                val sort = child.tag.toString().toInt()
-            }
+//                val entity = seasoningItems.firstOrNull { it.sort == sort } ?: SeasoningEntity()
-            Log.d(TAG, "addWeighListener: update-----------------------")
+//                clickGridItem(sort, entity)
-        })
+//            }
-    }
+//        }
-
+//    }
-    private var seasoningItems = mutableListOf<SeasoningEntity>()
+//
-    private fun addGridItemListener() {
+//    val detector = MultiClickDetector(targetCount = 10, intervalMs = 800)
-        binding.include.root.forEach { child ->
+//
-            child.clickWithDebounce {
+//    private fun defaultDataSettingDialog() {
-                val sort = child.tag.toString().toInt()
+//        CommonDialog(this)
-                val entity = seasoningItems.firstOrNull { it.sort == sort } ?: SeasoningEntity()
+//            .setTitle("温馨提示")
-                clickGridItem(sort, entity)
+//            .setContent("您好，使用默认配置作为您的调料数据，则已有配置将被清除，确认吗？")
-            }
+//            .setNegativeButton("取消")
-        }
+//            .setPositiveButton("确认") { resetList() }
-    }
+//            .setOnDismissCallback { hideStatusBar() }
-
+//            .show()
-    val detector = MultiClickDetector(targetCount = 10, intervalMs = 800)
+//    }
-
+//
-    private fun defaultDataSettingDialog() {
+//    private fun resetList() {
-        val remindBinding = LayoutFoodRemindBinding.inflate(layoutInflater)
+//        runCatching {
-        remindBinding.tvDialogTitle.text = "温馨提示"
+//            val record = JsonAssetsLoader.parseJsonFromAssets<ResetReasoningRecord>(
-        remindBinding.tvDialogContent.text =
+//                this,
-            "您好，使用默认配置作为您的调料数据，则已有配置将被清除，确认吗？"
+//                "default_seasoning_list.json"
-        CommonDialog(this).apply {
+//            )
-            messageView = remindBinding.root
+////            val weightArray = WeightUtil.weightArray
-            leftText = "取消"
+//            appViewModel.clearAllSeasoning {
-            rightText = "确认"
+//                record?.list?.forEach { entity ->
-            onLeftClick = { dismiss() }
+//                    entity.useWeight = weightArray[addressArray[entity.sort]].toDouble()
-            onRightClick = {
+//                    appViewModel.saveSeasoning(entity) {
-                dismiss()
+//                        updateGridData(entity)
-                resetList()
+//                    }
-            }
+//                }
-            onDismiss = { hideStatusBar() }
+////                loadSeasoning()
-        }.show()
+//            }
-    }
+//        }.onFailure { it.printStackTrace() }
-
+//    }
-    private fun resetList() {
+//
-        runCatching {
+//    private fun initViewModel() {
-            val record = JsonAssetsLoader.parseJsonFromAssets<ResetReasoningRecord>(
+//        val db = BaseApp.instance!!.database
-                this,
+//        val factory =
-                "default_seasoning_list.json"
+//            AppFactory(DbRepository(db.appDao()))
-            )
+//        appViewModel =
-//            val weightArray = WeightUtil.weightArray
+//            ViewModelProvider(this, factory)[DbViewModel::class.java]
-            appViewModel.clearAllSeasoning {
+//    }
-                record?.list?.forEach { entity ->
+//
-                    entity.useWeight = weightArray[addressArray[entity.sort]].toDouble()
+//    private fun loadSeasoning() {
-                    appViewModel.saveSeasoning(entity) {
+//        appViewModel.loadSeasoning {
-                        updateGridData(entity)
+//            seasoningItems.clear()
-                    }
+//            seasoningItems.addAll(it)
-                }
+//            initConfigData()
-//                loadSeasoning()
+//            setGridData(seasoningItems)
-            }
+//        }
-        }.onFailure { it.printStackTrace() }
+//    }
-    }
+//
-
+//    private fun initConfigData() {
-    private fun initViewModel() {
+//        repeat(12) { num ->
-        val db = BaseApp.instance!!.database
+//            val firstOne = seasoningItems.firstOrNull { it.sort == num }
-        val factory =
+//            if (firstOne == null) {
-            AppFactory(AppRepository(db.appDao()))
+//                seasoningItems.add(SeasoningEntity().also { it.sort = num })
-        appViewModel =
+//            }
-            ViewModelProvider(this, factory)[AppViewModel::class.java]
+//        }
-    }
+//    }
-
+//
-    private fun loadSeasoning() {
+//    private fun setGridData(list: MutableList<SeasoningEntity>) {
-        appViewModel.loadSeasoning {
+//        Log.d(TAG, "setGridData:  ${list.toJsonString()}")
-            seasoningItems.clear()
+//        val gridLayout = binding.include.root
-            seasoningItems.addAll(it)
+//        list.forEach { entity ->
-            initConfigData()
+//            val tag = entity.sort.toString()
-            setGridData(seasoningItems)
+//            val frameLayout = gridLayout.findViewWithTag<FrameLayout>(tag)
-        }
+//            TextCellAdapter.loadLayout(frameLayout, entity)
-    }
+//        }
-
+//    }
-    private fun initConfigData() {
+//
-        repeat(12) { num ->
+//    private fun updateGridData(entity: SeasoningEntity) {
-            val firstOne = seasoningItems.firstOrNull { it.sort == num }
+//        val gridLayout = binding.include.root
-            if (firstOne == null) {
+//        val tag = entity.sort.toString()
-                seasoningItems.add(SeasoningEntity().also { it.sort = num })
+//        val frameLayout = gridLayout.findViewWithTag<FrameLayout>(tag)
-            }
+//        TextCellAdapter.loadLayout(frameLayout, entity)
-        }
+//    }
-    }
+//
-
+//    private fun clickGridItem(sort: Int, entity: SeasoningEntity) {
-    private fun setGridData(list: MutableList<SeasoningEntity>) {
+//        val currentAddress = AddressUtil.getWeighAddressArray().get(sort)
-        val gridLayout = binding.include.root
+////        val seasoningEntity = list.first{it.sort == sort}
-        list.forEach { entity ->
+//        SeasoningSearchDialog(
-            val tag = entity.sort.toString()
+//            activity = this,
-            val frameLayout = gridLayout.findViewWithTag<FrameLayout>(tag)
+//            weighIndex = sort,
-            TextCellAdapter.loadLayout(frameLayout, entity)
+//            weighAddress = currentAddress,
-        }
+//            clickName = entity.goodsName
-    }
+//        ) { item ->
-
+//            syncItem(entity, item)
-    private fun updateGridData(entity: SeasoningEntity) {
+//            //3-调料
-        val gridLayout = binding.include.root
+//            entity.materialType = 3
-        val tag = entity.sort.toString()
+//            entity.sort = sort
-        val frameLayout = gridLayout.findViewWithTag<FrameLayout>(tag)
+//            saveSeasoning(entity) {
-        TextCellAdapter.loadLayout(frameLayout, entity)
+//                val tag = sort.toString()
-    }
+//                val gridLayout = binding.include.root
-
+//                val frameLayout = gridLayout.findViewWithTag<FrameLayout>(tag)
-    private fun clickGridItem(sort: Int, entity: SeasoningEntity) {
+//                TextCellAdapter.loadLayout(frameLayout, entity)
-        val currentAddress = AddressUtil.getWeighAddressArray().get(sort)
+//            }
-//        val seasoningEntity = list.first{it.sort == sort}
+//        }.show()
-        SeasoningSearchDialog(
+//    }
-            weighIndex = sort,
+//
-            weighAddress = currentAddress,
+//    private fun syncItem(oldItem: SeasoningEntity, newItem: SeasoningEntity) {
-            clickName = entity.goodsName
+//        oldItem.run {
-        ).show(this) { item ->
+//            goodsId = newItem.goodsId
-            syncItem(entity, item)
+//            goodsName = newItem.goodsName
-            //3-调料
+//            goodsOrRelationCode = newItem.goodsOrRelationCode
-            entity.materialType = 3
+//            relateionType = newItem.relateionType
-            entity.sort = sort
+//            materialType = newItem.materialType
-            saveSeasoning(entity) {
+//            allEdible = newItem.allEdible
-                val tag = sort.toString()
+//            useWeight = newItem.useWeight
-                val gridLayout = binding.include.root
+//            popularName = newItem.popularName
-                val frameLayout = gridLayout.findViewWithTag<FrameLayout>(tag)
+//            canteenId = newItem.canteenId
-                TextCellAdapter.loadLayout(frameLayout, entity)
+//            relateionType_dictText = newItem.relateionType_dictText
-            }
+//
-        }
+//            foodId = newItem.foodId
-    }
+//            sort = newItem.sort
-
+//        }
-    private fun syncItem(oldItem: SeasoningEntity, newItem: SeasoningEntity) {
+//    }
-        oldItem.run {
+//
-            goodsId = newItem.goodsId
+//    private fun loadQualitySpan(isClicked: Boolean = false, isEnable: Boolean = true) {
-            goodsName = newItem.goodsName
+//        binding.rbModeQuality.text =
-            goodsOrRelationCode = newItem.goodsOrRelationCode
+//            getModeTextSpan(
-            relateionType = newItem.relateionType
+//                topText = modeList[2].modeName,
-            materialType = newItem.materialType
+//                bottomText = modeList[2].modeDesc,
-            allEdible = newItem.allEdible
+//                topColor = if (isEnable) if (isClicked) "#00BC71" else "#000000" else "#B4B4B4",
-            useWeight = newItem.useWeight
+//                bottomColor = if (isEnable) "#8B8B8B" else "#B4B4B4"
-            popularName = newItem.popularName
+//            )
-            canteenId = newItem.canteenId
+//    }
-            relateionType_dictText = newItem.relateionType_dictText
+//
-
+//    private fun loadSamplingSpan(isClicked: Boolean = false, isEnable: Boolean = true) {
-            foodId = newItem.foodId
+//        binding.rbModeSampling.text =
-            sort = newItem.sort
+//            getModeTextSpan(
-        }
+//                topText = modeList[1].modeName,
-    }
+//                bottomText = modeList[1].modeDesc,
-
+//                topColor = if (isEnable) if (isClicked) "#00BC71" else "#000000" else "#B4B4B4",
-    private fun loadQualitySpan(isClicked: Boolean = false, isEnable: Boolean = true) {
+//                bottomColor = if (isEnable) "#8B8B8B" else "#B4B4B4"
-        binding.rbModeQuality.text =
+//            )
-            getModeTextSpan(
+//    }
-                topText = modeList[2].modeName,
+//
-                bottomText = modeList[2].modeDesc,
+//    private fun loadCookSpan(isClicked: Boolean = false, isEnable: Boolean = true) {
-                topColor = if (isEnable) if (isClicked) "#00BC71" else "#000000" else "#B4B4B4",
+//        binding.rbModeCook.text =
-                bottomColor = if (isEnable) "#8B8B8B" else "#B4B4B4"
+//            getModeTextSpan(
-            )
+//                topText = modeList[0].modeName,
-    }
+//                bottomText = modeList[0].modeDesc,
-
+//                topColor = if (isEnable) if (isClicked) "#00BC71" else "#000000" else "#B4B4B4",
-    private fun loadSamplingSpan(isClicked: Boolean = false, isEnable: Boolean = true) {
+//                bottomColor = if (isEnable) "#8B8B8B" else "#B4B4B4"
-        binding.rbModeSampling.text =
+//            )
-            getModeTextSpan(
+//    }
-                topText = modeList[1].modeName,
+//
-                bottomText = modeList[1].modeDesc,
+//    private fun getModeTextSpan(
-                topColor = if (isEnable) if (isClicked) "#00BC71" else "#000000" else "#B4B4B4",
+//        topText: String,
-                bottomColor = if (isEnable) "#8B8B8B" else "#B4B4B4"
+//        topColor: String,
-            )
+//        bottomText: String,
-    }
+//        bottomColor: String
-
+//    ): SpannableStringBuilder {
-    private fun loadCookSpan(isClicked: Boolean = false, isEnable: Boolean = true) {
+//
-        binding.rbModeCook.text =
+//
-            getModeTextSpan(
+//        return buildSpannableString {
-                topText = modeList[0].modeName,
+//            appendText(
-                bottomText = modeList[0].modeDesc,
+//                topText,
-                topColor = if (isEnable) if (isClicked) "#00BC71" else "#000000" else "#B4B4B4",
+//                ForegroundColorSpan(topColor.toColorInt()),
-                bottomColor = if (isEnable) "#8B8B8B" else "#B4B4B4"
+//                StyleSpan(Typeface.BOLD),
-            )
+//                AbsoluteSizeSpan(36, true),
-    }
+//                LineHeightSpan { text, start, end, spanstartv, v, fm ->
-
+//                    fm.descent += 10.dp // 增加行间距
-    private fun getModeTextSpan(
+//                }
-        topText: String,
+//            )
-        topColor: String,
+//            append("\n")
-        bottomText: String,
+//            appendText(
-        bottomColor: String
+//                bottomText,
-    ): SpannableStringBuilder {
+//                ForegroundColorSpan(bottomColor.toColorInt()),
-
+//                AbsoluteSizeSpan(26, true)
-
+//            )
-        return buildSpannableString {
+//        }
-            appendText(
+//    }
-                topText,
+//
-                ForegroundColorSpan(topColor.toColorInt()),
+//    fun saveSeasoning(entity: SeasoningEntity, action: () -> Unit = {}) {
-                StyleSpan(Typeface.BOLD),
+//        appViewModel.saveSeasoning(entity) {
-                AbsoluteSizeSpan(36, true),
+//            action()
-                LineHeightSpan { text, start, end, spanstartv, v, fm ->
+//            toast("保存成功")
-                    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("保存成功")
-        }
-    }
-
-}

app/src/main/java/com/shuwei/dish/match/ui/DishSamplingActivity.kt

@@ -1,304 +0,0 @@
-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.View
-import androidx.activity.viewModels
-import androidx.lifecycle.ViewModelProvider
-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.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
-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.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() {
-
-    private lateinit var binding: ActivityDishSamplingBinding
-
-    var foodName: String? = null
-
-    private var foodId: String? = null
-
-    companion object {
-        private const val TAG = "DishSamplingActivity"
-        public const val FOOD_NAME = "foodName"
-        public const val PAGE_FROM = "pageFrom"
-        public const val HOME = "home"
-    }
-
-    private var pageFrom: String? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivityDishSamplingBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        pageFrom = intent.getStringExtra(PAGE_FROM)
-        setTitleBar()
-        setHeaderBackground()
-        addViewClickListener()
-        initViewModel()
-        foodName = intent.getStringExtra(FOOD_NAME)
-        binding.etInputDish.setText(foodName)
-
-        WeightUtil.addWeightListener(
-            weightKey = TAG,
-            getWeight = { address, state, weight ->
-                //Log.d(TAG, "addViewClickListener: address=$address,state=$state,weight=$weight")
-                if (address == AddressUtil.ONE) {
-                    tempDishEntity?.useWeight = weight.toDouble()
-                    binding.tvDishPartWeight.text = "${weight}"
-                }
-            })
-    }
-
-    private fun setTitleBar() {
-        setTitleBar(titleBarAction = {
-            it.visible()
-        }, titleAction = {
-            it.text = "菜品采集"
-        }, rightIconActon = {
-            it.gone()
-            it.setImageResource(R.drawable.ic_setting)
-            it.setOnClickListener {
-                //startActivity<DeviceSettingActivity>()
-            }
-        }, backAction = {
-            it.visible()
-            it.setOnClickListener {
-                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(action: (MutableList<CookFoodEntity>?) -> Unit) {
-        appViewModel.getCookFoodList(cookMode = 1) { action(it) }
-    }
-
-    @Suppress("DEPRECATION")
-    @SuppressLint("GestureBackNavigation")
-    @Deprecated("Deprecated in Java")
-    override fun onBackPressed() {
-        if (list.isEmpty().not()) {
-            //说明有新增的食材
-            saveDataRemindDialog()
-            return
-        }
-        if (pageFrom == HOME) {
-            startActivity<SamplingListActivity>()
-        }
-        super.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()
-                if (pageFrom == HOME) {
-                    startActivity<SamplingListActivity>()
-                }
-                finish()
-            }
-            onDismiss = { hideStatusBar() }
-        }.show()
-    }
-
-
-    val list: MutableList<CookFoodGoodsEntity> = mutableListOf()
-
-    private var tempDishEntity: CookFoodGoodsEntity? = null
-
-    private var dishMaterialType = 1
-
-    private val dishAdapter by lazy {
-        DishPartAdapter(list).apply {
-            addOnItemChildClickListener(R.id.ivOperateIcon) { _, _, position ->
-                //删除操作
-                list.removeAt(position)
-                notifyItemRemoved(position)
-                notifyItemRangeChanged(position, list.size - position)
-            }
-        }
-    }
-
-    @SuppressLint("NotifyDataSetChanged")
-    private fun addViewClickListener() {
-        binding.rvDishPartList.run {
-            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()
-        }
-        binding.ivDishTypeSearch.setOnClickListener {
-            searchDishType()
-        }
-
-        binding.ivWeightClear.setOnClickListener {
-            WeightUtil.tareTwo(AddressUtil.ONE)
-        }
-        binding.ivWeightAdd.setOnClickListener {
-            if (tempDishEntity == null) {
-                toast("请输入食材名称")
-                return@setOnClickListener
-            }
-            if (binding.rgSampling.checkedRadioButtonId == -1) {
-                toast("请选择主辅材类型")
-                return@setOnClickListener
-            }
-            val realWeight = tempDishEntity!!.useWeight ?: 0.0
-            if (realWeight <= 0.toDouble()) {
-                toast("食材用量需要大于0")
-                return@setOnClickListener
-            }
-            if (tempDishEntity?.goodsName != binding.etInputDishType.text.toString().trim()) {
-                toast("所选择的食材名称与输入框内容不一致")
-                return@setOnClickListener
-            }
-            tempDishEntity!!.apply {
-                isSamplingPage = true
-                materialType = dishMaterialType
-            }
-            val result = list.firstOrNull { it.goodsId == tempDishEntity!!.goodsId }
-            if (result != null) {
-                toast("${result.goodsName}食材已添加，请勿重复操作")
-                return@setOnClickListener
-            }
-            list.add(tempDishEntity!!)
-            dishAdapter.notifyDataSetChanged()
-            tempDishEntity = null
-            binding.etInputDishType.setText("")
-            binding.rgSampling.clearCheck()
-        }
-        binding.rgSampling.setOnCheckedChangeListener { group, checkedId ->
-            dishMaterialType = if (checkedId == R.id.rbDishTypeFirst) 1 else 2
-        }
-        binding.ivDishSearch.setOnClickListener { v ->
-            jumpSearch(v)
-        }
-        binding.btnCook.clickWithDebounce {
-            val showFoodName = binding.etInputDish.text.toString().trim()
-            if (showFoodName.isBlank()) {
-                toast("菜品名称为空")
-                return@clickWithDebounce
-            }
-            if (list.isEmpty()) {
-                toast("菜品构成信息未设置")
-                return@clickWithDebounce
-            }
-            val food = FoodRecord()
-            binding.etInputDish.let {
-                if (it.tag!=null && it.tag.toString() == it.text.toString()) {
-                    food.foodId =  foodId
-                }
-            }
-            food.foodName = showFoodName
-            food.cookMode = 1
-            Log.d(TAG, "goToSubmit: goodsList:${list.toJsonString()}")
-//            startActivity<SubmitDishActivity> {
-            startActivity<SubmitFoodActivity> {
-                putExtra(SubmitFoodActivity.GOODS_LIST, list as java.io.Serializable)
-                putExtra(SubmitFoodActivity.FOOD_ITEM, food as Serializable)
-            }
-        }
-        binding.etInputDish.let { v ->
-            v.addOnActionSearchListener {
-                jumpSearch(v)
-            }
-        }
-    }
-
-    private fun jumpSearch(v: View) {
-        launch(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)
-                binding.etInputDish.run {
-                    setText(foodName)
-                    tag = foodName
-                    setSelection(text.length)
-                }
-            }
-        }
-        KeyboardUtil.hideKeyboard(v.context, v)
-    }
-
-    private fun searchDishType() {
-        val inputText = binding.etInputDishType.text.toString().trim()
-        FoodSearchDialog(defGoodsName = inputText).show(this@DishSamplingActivity) { item ->
-            val filterResult = list.firstOrNull { it.goodsName == item.goodsName }
-            if (filterResult != null) {
-                toast("不允许重复添加同一食材")
-                return@show
-            }
-            binding.etInputDishType.run {
-                setText(item.goodsName)
-                setSelection(length())
-            }
-            tempDishEntity = CookFoodGoodsEntity().apply {
-                goodsId = item.goodsId
-                goodsName = item.goodsName
-
-                relateionType = item.relateionType ?: 0
-                goodsOrRelationCode = item.goodsOrRelationCode
-
-                isNewDishType = true
-                // TODO: 待定
-                //allEdible = item.allEdible
-            }
-        }
-    }
-
-}

app/src/main/java/com/shuwei/dish/match/ui/FoodRecognizeActivity.kt

@@ -0,0 +1,462 @@
+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 androidx.recyclerview.widget.RecyclerView
+import com.shuwei.dish.match.adapter.FoodAdapter
+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.GoodsItem
+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
+import androidx.core.view.updateLayoutParams
+import androidx.lifecycle.lifecycleScope
+import com.shuwei.dish.match.net.UiState
+import com.shuwei.dish.match.objbox.FoodModule
+import com.shuwei.dish.match.utils.ext.dp
+import com.shuwei.dish.match.utils.ext.toast
+import kotlinx.coroutines.launch
+
+/**
+ * 食材识别结果页面
+ * 展示识别到的食材照片、食材列表、选中食材名称及秤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"
+
+        private var recognizeNameList: ArrayList<FoodModule.IdNameScore>? = null
+
+        /**
+         * 启动本页面，通过 onResult 回调返回用户选中的食材
+         * @param activity 宿主 Activity
+         * @param imageUri 食材照片路径（可为空）
+         * @param nameScoreList 识别到的食材列表
+         * @param finishCallback 页面关闭后回调，携带用户选中的食材（未选中时为 null）
+         */
+        fun start(
+            activity: BaseActivity,
+            imageUri: String? = null,
+            currentWeight: Double = 0.0,
+            nameScoreList: ArrayList<FoodModule.IdNameScore> = arrayListOf(),
+            finishCallback: (Boolean, GoodsItem?) -> Unit = { _, _ -> }
+        ) {
+            recognizeNameList = nameScoreList
+            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,
+                        GoodsItem::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<GoodsItem>()
+
+    /** 当前选中的列表位置，-1 表示无选中 */
+    private var selectedPosition = -1
+
+    /** 秤1当前实时重量 */
+    private var currentWeight = 0.0
+
+    /** 重量减少时延迟更新的任务，页面关闭前取消可防止用错误重量 */
+    private var pendingWeightRunnable: Runnable? = null
+
+    /** 当前待延迟更新的目标重量，避免相同重量重复重置计时器 */
+    private var pendingWeight = 0.0
+
+    /** 右侧自定义滚动指示条最小高度 */
+    private val scrollIndicatorMinHeightPx by lazy { (24 * resources.displayMetrics.density).toInt() }
+
+    /** 食材搜索弹窗，持有引用防止重复打开 */
+    private var foodSearchDialog: FoodSearchDialog? = null
+
+    /** 通过name查询IdNameScore */
+    private val nameScoreMap = mutableMapOf<String, FoodModule.IdNameScore>()
+
+    /** 识别物品名称列表 */
+    private val goodsNameList = mutableListOf<String>()
+
+    private val scrollListener = object : RecyclerView.OnScrollListener() {
+        override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+            updateScrollIndicator()
+        }
+    }
+
+    private val adapter = FoodAdapter(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()
+                }
+            }
+        )
+        initRecyclerView()
+        updateRvParentLayoutHeight()
+        initClickListeners()
+
+        onBackPressedDispatcher.addCallback(this) {
+            manualBack()
+        }
+        initObserver()
+        initData()
+    }
+
+    /**
+     * 手动返回
+     */
+    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 tempList = arrayListOf<GoodsItem>()
+        recognizeNameList?.apply {
+            forEach {
+                val goodsName = it.name.split("WP").first()
+                goodsNameList.add(goodsName)
+                nameScoreMap.put(goodsName, it)
+
+                // TODO: 测试数据，临时使用-------------------------
+                val testData = buildTestData(it)
+                tempList.add(testData)
+                // TODO: 测试数据，临时使用-------------------------
+            }
+            // TODO: 测试数据，临时使用-------------------------
+            loadRecognizeList(tempList)
+            // TODO: 测试数据，临时使用-------------------------
+            recognizeNameList = null
+        }
+
+        // TODO: 注释掉等接口正常再调用，临时使用测试数据
+        //netViewModel.queryGoodsList(goodsType = "0", goodsNames = goodsNameList)
+    }
+
+    private fun buildTestData(item: FoodModule.IdNameScore): GoodsItem {
+        var foodName = ""
+        var foodId = ""
+        item.name.split("WP").let {
+            foodName = it[0]
+            foodId = if (it.size > 1) {
+                "WP${it[1]}"
+            } else {
+                item.name
+            }
+        }
+        return GoodsItem(
+            goodsId = foodId,
+            goodsName = foodName
+        ).also {
+            it.foodScore = ((1 - item.score) * 10000).toInt()
+            it.isOriginalData = false
+        }
+    }
+
+
+    private fun initObserver() {
+        lifecycleScope.launch {
+            netViewModel.goodsListState.collect { state ->
+                when (state) {
+                    is UiState.Loading -> {
+                        showLoading()
+                    }
+
+                    is UiState.Success -> {
+                        delayDismissLoading()
+                        loadRecognizeList(state.data)
+                    }
+
+                    is UiState.Error -> {
+                        delayDismissLoading()
+                        toast(state.msg)
+                    }
+
+                    is UiState.Idle -> {}
+                }
+            }
+        }
+    }
+
+    private fun loadRecognizeList(goodsList: List<GoodsItem>?) {
+        if (goodsList.isNullOrEmpty()) {
+            binding.flListContainer.updateLayoutParams {
+                height = 260.dp
+            }
+            binding.rvRecognizeList.gone()
+            binding.tvNoData.visible()
+            return
+        }
+        binding.rvRecognizeList.visible()
+        binding.tvNoData.gone()
+        list.clear()
+        goodsList.forEach {
+            val food = nameScoreMap[it.goodsName]
+            val foodScore = ((1 - (food?.score ?: 0.0)) * 10000).toInt()
+            list.add(it.also { it.foodScore = foodScore })
+        }
+        adapter.notifyDataSetChanged()
+        updateRvParentLayoutHeight()
+        // 默认选中第一项
+        selectedPosition = 0
+        list[0].isClicked = true
+        list[0].useWeight = currentWeight
+        binding.tvSelectedFood.text = list[0].goodsName ?: "-"
+    }
+
+    /**
+     * 初始化 RecyclerView
+     */
+    private fun initRecyclerView() {
+        binding.rvRecognizeList.let {
+            it.layoutManager = GridLayoutManager(this@FoodRecognizeActivity, 2)
+            it.adapter = adapter
+            it.isVerticalScrollBarEnabled = false
+            it.removeOnScrollListener(scrollListener)
+            it.addOnScrollListener(scrollListener)
+            it.post { updateScrollIndicator() }
+        }
+        updateListVisibility()
+    }
+
+    /**
+     * 更新RecyclerView父布局高度
+     */
+    private fun updateRvParentLayoutHeight() {
+        binding.flListContainer.updateLayoutParams {
+            height = if (adapter.items.size > 2) 260.dp else 130.dp
+        }
+    }
+
+    /**
+     * 根据列表是否有数据控制 RecyclerView 显隐
+     */
+    private fun updateListVisibility() {
+        if (list.isNotEmpty()) {
+            binding.rvRecognizeList.post { updateScrollIndicator() }
+        }
+    }
+
+    /**
+     * 根据 RecyclerView 滚动状态刷新右侧自定义指示条
+     */
+    private fun updateScrollIndicator() {
+        val recyclerView = binding.rvRecognizeList
+        val track = binding.vScrollIndicatorTrack
+        val thumb = binding.vScrollIndicatorThumb
+
+        if (!recyclerView.canScrollVertically(1) && !recyclerView.canScrollVertically(-1)) {
+            track.gone()
+            thumb.gone()
+            return
+        }
+
+        val range = recyclerView.computeVerticalScrollRange()
+        val extent = recyclerView.computeVerticalScrollExtent()
+        val offset = recyclerView.computeVerticalScrollOffset()
+        if (range <= 0 || extent <= 0 || range <= extent) {
+            track.gone()
+            thumb.gone()
+            return
+        }
+
+        val trackHeight = track.height.takeIf { it > 0 } ?: recyclerView.height
+        if (trackHeight <= 0) return
+
+        val thumbHeight = ((extent.toFloat() / range) * trackHeight)
+            .toInt()
+            .coerceAtLeast(scrollIndicatorMinHeightPx)
+            .coerceAtMost(trackHeight)
+
+        val maxTop = (trackHeight - thumbHeight).coerceAtLeast(0)
+        val scrollable = (range - extent).coerceAtLeast(1)
+        val thumbTop = ((offset.toFloat() / scrollable) * maxTop).toInt().coerceIn(0, maxTop)
+
+        if (thumb.layoutParams.height != thumbHeight) {
+            thumb.layoutParams = thumb.layoutParams.apply { height = thumbHeight }
+        }
+        thumb.translationY = thumbTop.toFloat()
+
+        track.visible()
+        thumb.visible()
+    }
+
+    /**
+     * 初始化按钮点击事件
+     */
+    private fun initClickListeners() {
+        // 更换食材：打开食材搜索弹窗，已打开时跳过
+        binding.btnChangeFood.clickWithDebounce {
+//            val currentName = list.getOrNull(selectedPosition)?.goodsName
+            if (foodSearchDialog?.isShowing == true) return@clickWithDebounce
+            foodSearchDialog = FoodSearchDialog(
+                activity = this,
+//                defGoodsName = currentName,
+                onItemSelected = { item -> updateSelectedFood(item) }
+            ).also { it.show() }
+        }
+
+        // 取消：关闭页面
+        binding.btnCancel.setOnClickListener { manualBack() }
+    }
+
+    /**
+     * 用新食材替换当前选中项（或追加到列表首位）
+     */
+    @SuppressLint("NotifyDataSetChanged")
+    private fun updateSelectedFood(item: GoodsItem) {
+        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()
+        if (list.isNotEmpty()) {
+            binding.rvRecognizeList.visible()
+            binding.tvNoData.gone()
+        }
+        updateRvParentLayoutHeight()
+        binding.tvSelectedFood.text = item.goodsName ?: "-"
+        updateListVisibility()
+        binding.rvRecognizeList.post { updateScrollIndicator() }
+    }
+
+    /**
+     * 注册秤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)
+    }
+}

app/src/main/java/com/shuwei/dish/match/ui/FoodSearchActivity.kt

@@ -4,14 +4,18 @@ 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
+import com.shuwei.dish.match.adapter.Food2Adapter
 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.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
@@ -19,7 +23,11 @@ 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 java.io.Serializable
+import kotlinx.coroutines.launch
 
+/**
+ * 菜品搜索页面
+ */
 class FoodSearchActivity : BaseActivity() {
 
     companion object {
@@ -36,13 +44,13 @@ class FoodSearchActivity : BaseActivity() {
     private var pageType = 0
     private var dinnerType = "1"
     private val recordAdapter by lazy {
-        FoodRecordAdapter(list).apply {
+        Food2Adapter(list).apply {
             isStateViewEnable = true
             setOnItemClickListener { adapter, view, position ->
                 if (pageType == 1) {
                     val jumpItem = list[position].also { it.dinnerType = dinnerType }
-                    startActivity<PrepareCookActivity> {
+                    startActivity<PrepareFoodActivity> {
-                        putExtra(PrepareCookActivity.FOOD_ITEM, jumpItem as Serializable)
+                        putExtra(PrepareFoodActivity.FOOD_ITEM, jumpItem as Serializable)
                     }
                     return@setOnItemClickListener
                 }
@@ -83,13 +91,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)
@@ -106,13 +139,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)
             }
         }
     }
@@ -140,61 +173,6 @@ class FoodSearchActivity : BaseActivity() {
 
     @SuppressLint("NotifyDataSetChanged")
     private fun queryListInfo(input: String) {
-        showLoading()
-//        val map = mutableMapOf(
-//            "foodName" to input.trim(),
-//            "pageNo" to "$pageNo",
-//            "pageSize" to "$pageSize",
-//            "canteenId" to BaseApp.canteenId
-//            "dinnerType" to getDinnerTypeText()
-//        )
-//        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 = {
-//                delayDismissLoading()
-//                finishRefresh()
-//                binding.refreshLayout.run {
-//                    setEnableRefresh(true)
-//                }
-//                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!!)
-//                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()
-//                }
-//            }
-//        )
-
         val map = mutableMapOf<String, Any>(
             "foodName" to input.trim(),
             "pageNum" to pageNo,
@@ -202,40 +180,27 @@ class FoodSearchActivity : BaseActivity() {
             "placeId" to BaseApp.canteenId,
             "dinnerType" to getDinnerTypeText()
         )
-        netViewModel.searchFoodList(
+        netViewModel.searchFoodList(param = map)
-            param = map,
+    }
-            onSuccess = {
+
-                delayDismissLoading()
+    /**
-                finishRefresh()
+     * 处理搜索结果，填充列表或展示空视图
-                binding.refreshLayout.setEnableRefresh(true)
+     */
-                if (it.isNullOrEmpty()) {
+    @SuppressLint("NotifyDataSetChanged")
-//                    toast("暂未搜索到相关菜品信息")
+    private fun handleSearchResult(records: MutableList<FoodRecord>?) {
-                    if (pageNo == 1) {
+        delayDismissLoading()
-                        loadEmptyView()
+        finishRefresh()
-                    }
+        binding.refreshLayout.setEnableRefresh(true)
-                    return@searchFoodList
+        if (records.isNullOrEmpty()) {
-                }
+            if (pageNo == 1) loadEmptyView()
-                if (pageNo == 1) {
+            return
-                    list.clear()
+        }
-                }
+        if (pageNo == 1) list.clear()
-                list.addAll(it)
+        list.addAll(records)
-                recordAdapter.notifyDataSetChanged()
+        recordAdapter.notifyDataSetChanged()
-                val isLoadMoreEnable = it.size >= pageSize
+        val isLoadMoreEnable = records.size >= pageSize
-                binding.refreshLayout.setEnableLoadMore(isLoadMoreEnable)
+        binding.refreshLayout.setEnableLoadMore(isLoadMoreEnable)
-                if (isLoadMoreEnable) {
+        if (isLoadMoreEnable) pageNo++
-                    pageNo++
-                }
-            }, onFailure = { code, msg ->
-                binding.refreshLayout.run {
-                    setEnableRefresh(true)
-                }
-                toast(msg)
-                delayDismissLoading()
-                finishRefresh()
-                if (pageNo == 1) {
-                    loadEmptyView()
-                }
-            })
     }
 
     private fun finishRefresh() {

app/src/main/java/com/shuwei/dish/match/ui/HomeActivity.kt

@@ -2,21 +2,23 @@ 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.utils.SpTool
 import com.shuwei.dish.match.utils.ext.startActivity
 import com.shuwei.dish.match.utils.ext.toast
-import com.shuwei.dish.match.viewmodel.AppViewModel
+import kotlinx.coroutines.launch
-import com.shuwei.dish.match.viewmodel.factory.AppFactory
 
+/**
+ * 主页，包括三种模式：制作模式、采样模式、品控模式
+ */
 class HomeActivity : BaseActivity() {
 
     companion object {
@@ -31,7 +33,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)
@@ -48,6 +49,7 @@ class HomeActivity : BaseActivity() {
                 BaseApp.canteenId = "0"
             }
         }
+        onBackPressedDispatcher.addCallback(this) {}
 //        binding.radioGroup.check(R.id.radioZk)
         initRecyclerView()
 //        HttpUtil.getAppToken()
@@ -105,8 +107,8 @@ class HomeActivity : BaseActivity() {
                 modeDesc = "菜品快速制作，记录熟重",
                 modeIconId = R.drawable.ic_mode_cook,
                 onClick = {
-                    SpTool.put(SpTool.LAUNCH_PAGE_TYPE, 0)
+                    SpTool.cookMode = 0
-                    startActivity<SelectDishActivity>()
+                    startActivity<CookingModeActivity>()
                     finish()
                 })
         )
@@ -116,7 +118,7 @@ class HomeActivity : BaseActivity() {
                 modeDesc = "菜品快速制作，记录熟重",
                 modeIconId = R.drawable.ic_mode_sampling,
                 onClick = {
-                    SpTool.put(SpTool.LAUNCH_PAGE_TYPE, 1)
+                    SpTool.cookMode = 1
                     goSampling()
                 })
         )
@@ -132,44 +134,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 {
+        lifecycleScope.launch {
-            if (it.isEmpty()) {
+            val slots = appViewModel.loadSeasoningSlot()
-                //无调料信息打开采样历史列表页面，点击设置配置调料信息
+            if (slots.isEmpty()) {
-                startActivity<SamplingListActivity>()
+                // 无调料信息，打开采样历史列表页面，点击设置配置调料信息
+                startActivity<SamplingModeActivity>()
                 finish()
-                return@loadSeasoning
+                return@launch
             }
-            appViewModel.countCookFood(cookMode = 1) { count ->
+            val count = appViewModel.countCookFood(cookMode = 1)
-                if (count > 0) {
+            if (count > 0) {
-                    //有烹饪中数据打开采样历史列表页面
+                // 有烹饪中数据，打开采样历史列表页面
-                    startActivity<SamplingListActivity>()
+                startActivity<SamplingModeActivity>()
-                    finish()
-                    return@countCookFood
-                }
-                //无烹饪数据打开新增采样页面
-                startActivity<DishSamplingActivity> {
-                    putExtra(DishSamplingActivity.PAGE_FROM, DishSamplingActivity.HOME)
-                }
                 finish()
+                return@launch
             }
+            // 无烹饪数据，打开新增采样页面
+            startActivity<PrepareFoodActivity> {
+                putExtra(PrepareFoodActivity.PAGE_FROM, PrepareFoodActivity.HOME)
+            }
+            finish()
         }
     }
 
-    @Deprecated("Deprecated in Java")
-    @SuppressLint("GestureBackNavigation", "MissingSuperCall")
-    override fun onBackPressed() {
-        //super.onBackPressed()
-        //当前页面不允许返回
-        //dialog = toast("不允许返回操作")
-    }
-
 }