厨配秤: 统一采样数据结构及接口

- 将提交构成接口改为提交采样，废弃制作模式，调整请求参数结构
- 修改采样历史接口为已提交采样列表，调整接口路径和请求参数
- 更新数据模型，替换旧的审核状态为实验状态，新增实验编号字段
- 修改列表适配器显示逻辑，展示实验状态及熟重信息，调整颜色映射
- 调整相关网络请求及回调函数，删除无用参数，简化调用
- 更新UI页面文本，适配新版采样列表数据格式与提示信息
- 删除相关无用的旧状态定义及属性，保持代码整洁

.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="2025-09-10T07:28:30.961571900Z">
-          <Target type="DEFAULT_BOOT">
-            <handle>
-              <DeviceId pluginId="Default" identifier="serial=192.168.1.21:5555;connection=bc7af9a5" />
-            </handle>
-          </Target>
-        </DropdownSelection>
-        <DialogSelection />
-      </SelectionState>
-    </selectionStates>
-  </component>
-</project>

.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,13 @@
-
 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 {
@@ -18,13 +23,12 @@ android {
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         ndk {
-            //设置支持的SO库架构
+            //设置支持的SO库架构；x86_64 仅用于在 Windows 模拟器上调试（秤功能不可用）
             abiFilters.addAll(listOf("armeabi-v7a"))
-            //, 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a'
         }
 
         // 设置输出APK文件名格式
-        setProperty("archivesBaseName", "菜品配比终端v${versionName}")
+        setProperty("archivesBaseName", "pbc_v${versionName}")
     }
     signingConfigs {
         create("debug_507") {
@@ -42,10 +46,13 @@ android {
                 "proguard-rules.pro"
             )
             signingConfig = signingConfigs.getByName("debug_507")
+            buildConfigField("Boolean", "IS_TEST_DEVICE", "false")
         }
         debug {
             //507扫码秤主板在android.buildTypes{}内增加
             signingConfig = signingConfigs.getByName("debug_507")
+            // 调试构建视为测试设备，使用固定的 DEVICE_ID_1 代替真实 UDID
+            buildConfigField("Boolean", "IS_TEST_DEVICE", "false")
         }
     }
     compileOptions {
@@ -57,6 +64,7 @@ android {
     }
     buildFeatures {
         viewBinding = true
+        buildConfig = true
     }
     packagingOptions {
         pickFirst("lib/armeabi-v7a/libserial_port.so")
@@ -74,7 +82,9 @@ android {
     }
 //    li
 }
-
+val isDebug = gradle.startParameter.taskNames.any {
+    it.contains("debug", ignoreCase = true)
+}
 dependencies {
     implementation(fileTree("libs") { include("*.jar", "*.aar") })
     implementation(libs.androidx.core.ktx)
@@ -86,30 +96,57 @@ dependencies {
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
+    implementation(libs.androidx.activity.ktx)
+    implementation(libs.androidx.fragment.ktx)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.lifecycle.viewmodel.ktx)
 
-    implementation("com.squareup.okhttp3:okhttp:4.9.1")
+    implementation(libs.gson)
-    implementation("com.google.code.gson:gson:2.10.1")
+    implementation(libs.okhttp)
-//    implementation("com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.30")
+    implementation(libs.logging.interceptor)
+    implementation(libs.retrofit)
+    implementation(libs.java.websocket)
+    implementation(libs.converter.gson)
+    implementation(libs.flexbox)
 
-    implementation("io.github.cymchad:BaseRecyclerViewAdapterHelper4:4.1.2")
+    implementation(libs.baserecyclerviewadapterhelper4)
 
-    implementation("androidx.room:room-runtime:2.5.2")
+    // 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,54 @@
+{
+  "_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": "5:7592685238899911344",
+      "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
+        },
+        {
+          "id": "5:7592685238899911344",
+          "name": "version",
+          "type": 9
+        }
+      ],
+      "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,8 @@
         <activity
             android:name=".ui.InitActivity"
             android:exported="true"
-            android:screenOrientation="portrait"
+            android:launchMode="singleTask"
+            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboardHidden|keyboard|navigation|uiMode|locale|layoutDirection|fontScale|density"
             tools:ignore="DiscouragedApi,LockedOrientationActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -50,24 +55,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 +92,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.model.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
+import com.shuwei.dish.match.model.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,50 @@
+package com.shuwei.dish.match.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+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.model.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
+        }
+        // 显示当前选中的净材种类，无数据时隐藏
+        holder.binding.tvRawMaterialsType.run {
+            if (item.rawMaterialsType.isNullOrEmpty()) {
+                visibility = View.GONE
+            } else {
+                visibility = View.VISIBLE
+                text = item.rawMaterialsType
+            }
+        }
+    }
+
+    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,76 @@
+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.model.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.root.run {
+            setBackgroundResource(
+                if (item.isClicked) R.drawable.shape_green_stroke
+                else R.drawable.shape_white_12_corners
+            )
+        }
+        holder.binding.tvGoodsInfo.run {
+            text = item.goodsName
+            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
+
+            }
+        }
+        if (item.rawMaterialsType.isNullOrBlank()) {
+            holder.binding.tvRawMaterialsType.gone()
+        } else {
+            holder.binding.tvRawMaterialsType.let {
+                it.visible()
+                it.text = item.rawMaterialsType
+            }
+        }
+    }
+
+    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,125 @@
+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.model.FoodRecord
+import com.shuwei.dish.match.model.SampleStatus
+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
+            }
+            // 非烹饪中，采样模式
+            tvDishName.setTextColor(ContextCompat.getColor(holder.itemView.context, R.color.dish_green))
+            clBlock.setBackgroundResource(R.drawable.shape_white_fb_15_corners)
+            // 已提交采样列表（sample-list）：展示实验状态 + 熟重(g)
+            val statusName = item.statusName
+            if (!statusName.isNullOrBlank()) {
+                tvDishCount.text = "熟重：${formatGram(foodWeight)}"
+                tvShowState.text = statusName
+                tvShowState.setTextColor(statusColor(holder, item.status))
+                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"
+        }
+    }
+
+    /** 熟重(g)格式化，整数不带小数，小数保留 2 位 */
+    private fun formatGram(weight: Double): String {
+        val gramDf = DecimalFormat("0.##")
+        return "${gramDf.format(weight)}g"
+    }
+
+    /** 实验状态着色：1=实验中(灰) / 2=已评测(绿) / 9=已转化(绿) */
+    private fun statusColor(holder: VH, status: Int?): Int {
+        val context = holder.itemView.context
+        return when (status) {
+            SampleStatus.EVALUATED, SampleStatus.CONVERTED ->
+                ContextCompat.getColor(context, R.color.dish_green)
+            else -> ContextCompat.getColor(context, R.color.black999)
+        }
+    }
+
+    private val df = DecimalFormat("0.000")
+}

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

@@ -0,0 +1,81 @@
+package com.shuwei.dish.match.adapter
+
+import android.content.Context
+import android.content.res.ColorStateList
+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.model.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
+import androidx.core.graphics.toColorInt
+
+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
+            //if (data.isOriginalData) {
+            //    tvDishName.text = data.goodsName
+            //} else {
+            //    tvDishName.text = data.goodsName + "-${data.rawMaterialsType}"
+            //}
+            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
+            )
+            // isOriginalData 时根据是否有重量信息控制图标颜色：无重量染灰色，有重量恢复原色
+            if (data.isOriginalData) {
+                val hasWeight = data.useWeight != null && data.useWeight != 0.0
+                ivClearIcon.imageTintList = if (hasWeight) null
+                else ColorStateList.valueOf("#BFBFBF".toColorInt())
+            } else {
+                ivClearIcon.imageTintList = null
+            }
+            ivOperateIcon.setImageResource(
+                if (data.isSetFinished) R.drawable.ic_dish_selected
+                else R.drawable.ic_dish_unselected
+            )
+            clBlock.setBackgroundResource(
+                if (data.isClicked) 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/GoodsPreviewAdapter.kt

@@ -0,0 +1,46 @@
+package com.shuwei.dish.match.adapter
+
+import android.annotation.SuppressLint
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.shuwei.dish.match.databinding.ItemGoodsPreviewBinding
+import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
+
+/**
+ * 用料明细预览列表适配器
+ * 显示字段：foodId、goodsId、goodsCode、goodsName、materialType、useWeight
+ */
+class GoodsPreviewAdapter(
+    private val list: List<CookFoodGoodsEntity>
+) : RecyclerView.Adapter<GoodsPreviewAdapter.VH>() {
+
+    inner class VH(val binding: ItemGoodsPreviewBinding) : RecyclerView.ViewHolder(binding.root)
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VH {
+        val binding = ItemGoodsPreviewBinding.inflate(
+            LayoutInflater.from(parent.context), parent, false
+        )
+        return VH(binding)
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun onBindViewHolder(holder: VH, position: Int) {
+        val item = list[position]
+        holder.binding.run {
+            tvGoodsId.text = item.goodsId
+            tvGoodsCode.text = item.goodsCode.orEmpty()
+            tvGoodsName.text = item.goodsName.orEmpty()
+            // materialType：1主料 2辅料 3调料
+            tvMaterialType.text = when (item.materialType) {
+                1 -> "主料"
+                2 -> "辅料"
+                3 -> "调料"
+                else -> "${item.materialType}"
+            }
+            tvUseWeight.text = "${item.useWeight ?: 0.0}g"
+        }
+    }
+
+    override fun getItemCount() = list.size
+}

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

@@ -8,7 +8,7 @@ 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.ListItemHomeModeBinding
-import com.shuwei.dish.match.entity.HomeModeBean
+import com.shuwei.dish.match.model.HomeModeBean
 import com.shuwei.dish.match.utils.ext.gone
 import com.shuwei.dish.match.utils.ext.visible
 

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

@@ -1,54 +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 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
-                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 useWeight = if (totalWeight > 0.toDouble()) totalWeight else (item.foodWeight ?: 0.toDouble())
-                tvDishCount.text = "累计统计：${df.format(useWeight / 1000.0F)}kg(${item.count}次)"
-                tvShowState.text = "${df.format((item.foodWeight ?: 0.toDouble()) / 1000.0F)}kg"
-            }
-        }
-    }
-
-    val df = DecimalFormat("0.000")
-}

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

@@ -0,0 +1,104 @@
+package com.shuwei.dish.match.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+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.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 = WeightUtil.getStateStr(item.state)
+        if (item.state == WeightUtil.STATE_OVER_WEIGHT) {
+            holder.b.root.setBackgroundResource(R.drawable.shape_scale_cell_over_weight)
+            val white = ContextCompat.getColor(holder.b.root.context, R.color.white)
+            holder.b.tvScaleLabel.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)
+            holder.b.tvScaleLabel.setTextColor(ContextCompat.getColor(holder.b.root.context, R.color.black))
+            holder.b.tvName.setTextColor(ContextCompat.getColor(holder.b.root.context, R.color.black))
+            holder.b.tvWeight.setTextColor(ContextCompat.getColor(holder.b.root.context, R.color.home_title))
+            holder.b.tvState.setTextColor(ContextCompat.getColor(holder.b.root.context, R.color.home_sub_title))
+        }
+        // 点击时通过 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,177 @@
+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  = WeightUtil.getStateStr(item.state)
+        }
+        val white = ContextCompat.getColor(holder.b.root.context, R.color.white)
+        when {
+            valid && item!!.state == WeightUtil.STATE_OVER_WEIGHT -> {
+                holder.b.root.setBackgroundResource(R.drawable.shape_scale_cell_over_weight)
+                holder.b.tvAddress.setTextColor(white)
+                holder.b.tvName.setTextColor(white)
+                holder.b.tvWeight.setTextColor(white)
+                holder.b.tvState.setTextColor(white)
+            }
+            position == highlightedPosition -> {
+                holder.b.root.setBackgroundResource(R.drawable.shape_scale_cell_highlight)
+                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)
+    }
+}

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

@@ -0,0 +1,182 @@
+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  = WeightUtil.getStateStr(item.state)
+        }
+        val white = ContextCompat.getColor(holder.b.root.context, R.color.white)
+        when {
+            valid && item!!.state == WeightUtil.STATE_OVER_WEIGHT -> {
+                holder.b.root.setBackgroundResource(R.drawable.shape_scale_cell_over_weight)
+                holder.b.tvAddress.setTextColor(white)
+                holder.b.tvName.setTextColor(white)
+                holder.b.tvWeight.setTextColor(white)
+                holder.b.tvState.setTextColor(white)
+            }
+            position == highlightedPosition -> {
+                holder.b.root.setBackgroundResource(R.drawable.shape_scale_cell_highlight)
+                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)
+    }
+}

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

@@ -1,134 +0,0 @@
-//package com.shuwei.dish.match.adapter
-//
-//import android.annotation.SuppressLint
-//import android.widget.TextView
-//import androidx.recyclerview.widget.GridLayoutManager
-//import androidx.recyclerview.widget.RecyclerView
-//import com.shuwei.dish.match.base.BaseActivity
-//import com.shuwei.dish.match.dialog.BottomDialog2
-//import com.shuwei.dish.match.entity.SeasoningEntity
-//import com.shuwei.dish.match.ui.DeviceSettingActivity
-//import com.shuwei.dish.match.ui.SubmitDishActivity
-//import com.shuwei.dish.match.utils.DataUtil
-//
-//object SeasoningCellTool {
-//    private val TAG = "SeasoningCellTool"
-//
-//    private val list = mutableListOf<SeasoningEntity>()
-//    private lateinit var activity: BaseActivity
-//    private var pageType: Int = 0
-//
-//    @SuppressLint("StaticFieldLeak")
-//    private lateinit var cellAdapter: TextCellAdapter
-//
-//    @SuppressLint("NotifyDataSetChanged")
-//    fun loadData(
-//        activity: BaseActivity,
-//        initList: MutableList<SeasoningEntity>? = null,
-//        recyclerView: RecyclerView,
-//        tvCell: TextView,
-//        pageType: Int = 0
-//    ) {
-//        this.activity = activity
-//        this.pageType = pageType
-//        list.clear()
-//        val tempList = buildData(initList, pageType)
-//        list.addAll(tempList)
-//        recyclerView.run {
-//            if (adapter == null) {
-//                layoutManager = GridLayoutManager(
-//                    activity,
-//                    3,
-//                    GridLayoutManager.VERTICAL,
-//                    false
-//                )
-//                cellAdapter = TextCellAdapter(list).apply {
-//                    onCellClick = { position ->
-//                        val currentAddress = DataUtil.getWeighAddressArray().get(position)
-//                        BottomDialog2(
-//                            weighIndex = position,
-//                            weighAddress = currentAddress,
-//                            clickName = list[position].goodsName
-//                        ).show(activity) { item ->
-//                            list[position].let { current ->
-//                                syncItem(current, item)
-//                                //3-调料
-//                                current.materialType = 3
-//                                current.sort = position
-//                            }
-//                            notifyItemChanged(position)
-//                            if (position == 14) {
-//                                syncItem(list[10], list[14])
-//                                syncItem(list[11], list[14])
-//                                syncItem(list[13], list[14])
-//                                TextCellAdapter.loadCell(tvCell, list[14])
-//                                notifyItemChanged(10)
-//                                notifyItemChanged(11)
-//                                notifyItemChanged(13)
-//                                notifyItemChanged(14)
-//                            }
-//                            if (activity is DeviceSettingActivity) {
-//                                //activity.list = list
-//                                activity.saveSeasoning(list[position])
-//                            }
-//                        }
-//                    }
-//                }
-//                adapter = cellAdapter
-//            } else {
-//                cellAdapter.notifyDataSetChanged()
-//            }
-//            if (activity is SubmitDishActivity) {
-//                activity.updateSeasoningList(list)
-//            }
-//        }
-//        if (pageType == 1) {
-//            tvCell.setOnClickListener {
-//                cellAdapter.onCellClick?.invoke(14)
-//            }
-//        }
-//        TextCellAdapter.loadCell(tvCell, list[list.size - 1])
-//    }
-//
-//    private fun buildData(
-//        initList: MutableList<SeasoningEntity>?,
-//        pageType: Int = 0
-//    ): MutableList<SeasoningEntity> {
-//        val list = mutableListOf<SeasoningEntity>()
-//        repeat(15) {
-//            list.add(SeasoningEntity().apply { this.pageType = pageType })
-//        }
-//        if (initList.isNullOrEmpty().not()) {
-//            initList.forEach {
-//                if (it.sort < list.size) {
-//                    list[it.sort] = it.apply { this.pageType = pageType }
-//                }
-//            }
-//            var lastItem = initList.firstOrNull { it.sort == 14 }
-//            lastItem = lastItem ?: list[list.size - 1]
-//            list[10] = lastItem
-//            list[11] = lastItem
-//            list[13] = lastItem
-//        }
-//        return list
-//    }
-//
-//    private fun syncItem(item: SeasoningEntity, newItem: SeasoningEntity) {
-//        item.run {
-//            goodsId = newItem.goodsId
-//            goodsName = newItem.goodsName
-//            goodsOrRelationCode = newItem.goodsOrRelationCode
-//            relateionType = newItem.relateionType
-//            materialType = newItem.materialType
-//            allEdible = newItem.allEdible
-//            useWeight = newItem.useWeight
-//            popularName = newItem.popularName
-//            canteenId = newItem.canteenId
-//            relateionType_dictText = newItem.relateionType_dictText
-//
-//            foodId = newItem.foodId
-//            sort = newItem.sort
-//        }
-//    }
-//
-//}

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

@@ -7,23 +7,22 @@ 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.ListItemSeasoningBinding
-import com.shuwei.dish.match.entity.SeasoningEntity
+import com.shuwei.dish.match.model.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
-            setBackgroundResource(
-                if (item?.isClicked == true) R.drawable.shape_green_stroke
-                else R.drawable.shape_white_12_corners
-            )
             setTextColor(
                 ContextCompat.getColor(
                     context,
@@ -32,6 +31,10 @@ class SeasoningSearchAdapter(private var list: MutableList<SeasoningEntity>) :
                 )
             )
         }
+        holder.binding.root.setBackgroundResource(
+            if (item?.isClicked == true) R.drawable.shape_green_stroke
+            else R.drawable.shape_white_12_corners
+        )
     }
 
     override fun onCreateViewHolder(
@@ -40,10 +43,10 @@ class SeasoningSearchAdapter(private var list: MutableList<SeasoningEntity>) :
         viewType: Int
     ): VH {
         val binding =
-            ListItemSearchGoodsInfoBinding.inflate(LayoutInflater.from(context), parent, false)
+            ListItemSeasoningBinding.inflate(LayoutInflater.from(context), parent, false)
         return VH(binding)
     }
 
-    inner class VH(var binding: ListItemSearchGoodsInfoBinding) : QuickViewHolder(binding.root)
+    inner class VH(var binding: ListItemSeasoningBinding) : QuickViewHolder(binding.root)
 
 }

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

@@ -0,0 +1,81 @@
+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.databinding.ItemSeasoningWeightListBinding
+import com.shuwei.dish.match.utils.ext.roundedDecimalPlace
+
+/**
+ * 调料使用重量列表 Adapter
+ * 用于 SubmitFoodActivity 展示各调料槽位的实时用量
+ * 同名调料已在外部聚合，adapter 按 goodsName 作为唯一标识
+ * 支持两种布局模式：
+ *   - VIEW_TYPE_GRID（默认）：4 列卡片，名称与重量垂直排列
+ *   - VIEW_TYPE_LIST：2 列，名称与重量水平排列，名称占剩余空间
+ */
+class SeasoningWeightAdapter : BaseQuickAdapter<SeasoningWeightAdapter.Item, QuickViewHolder>() {
+
+    companion object {
+        /** 4 列卡片模式 */
+        const val VIEW_TYPE_GRID = 0
+        /** 2 列水平模式 */
+        const val VIEW_TYPE_LIST = 1
+    }
+
+    /** 调料展示数据项，key = goodsName（同名调料已聚合） */
+    data class Item(
+        val goodsId: String,
+        val goodsName: String,
+        /** 使用重量（克），同名调料已累加 */
+        val useWeight: Double
+    )
+
+    /** 当前布局模式，由外部切换后调用 notifyDataSetChanged 生效 */
+    var isListMode: Boolean = false
+
+    override fun getItemViewType(position: Int, list: List<Item>): Int {
+        return if (isListMode) VIEW_TYPE_LIST else VIEW_TYPE_GRID
+    }
+
+    /**
+     * 更新单个 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): QuickViewHolder {
+        return if (viewType == VIEW_TYPE_LIST) {
+            val binding = ItemSeasoningWeightListBinding.inflate(LayoutInflater.from(context), parent, false)
+            QuickViewHolder(binding.root)
+        } else {
+            val binding = ItemSeasoningWeightBinding.inflate(LayoutInflater.from(context), parent, false)
+            QuickViewHolder(binding.root)
+        }
+    }
+
+    override fun onBindViewHolder(holder: QuickViewHolder, position: Int, item: Item?) {
+        item ?: return
+        val showWeight = "${item.useWeight.roundedDecimalPlace(1)}g"
+        holder.setText(com.shuwei.dish.match.R.id.tvSeasoningName, item.goodsName)
+        holder.setText(com.shuwei.dish.match.R.id.tvSeasoningWeight, showWeight)
+    }
+
+}

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

@@ -0,0 +1,39 @@
+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.ListItemSettingBinding
+import com.shuwei.dish.match.model.SettingItem
+import com.shuwei.dish.match.utils.ext.gone
+import com.shuwei.dish.match.utils.ext.visible
+
+/**
+ * 设置页面列表适配器
+ * 点击事件直接调用 item.onClick()，无需在 Adapter 中分发业务逻辑
+ */
+class SettingAdapter : BaseQuickAdapter<SettingItem, SettingAdapter.VH>() {
+
+    override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
+        val binding = ListItemSettingBinding.inflate(LayoutInflater.from(context), parent, false)
+        return VH(binding)
+    }
+
+    override fun onBindViewHolder(holder: VH, position: Int, item: SettingItem?) {
+        item ?: return
+        holder.binding.tvTitle.text = item.title
+
+        // 有副标题则显示，否则隐藏
+        val subtitle = item.subtitle
+        if (subtitle != null) {
+            holder.binding.tvSubtitle.visible()
+            holder.binding.tvSubtitle.text = subtitle
+        } else {
+            holder.binding.tvSubtitle.gone()
+        }
+    }
+
+    inner class VH(val binding: ListItemSettingBinding) : 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 {
+//            } else {
-                root.visible()
+//                root.visible()
-            }
+//            }
-            loadCell(tvCell, item)
+//            loadCell(tvCell, item)
-            //root.setBackgroundResource(R.color.dish_green)
+//            //root.setBackgroundResource(R.color.dish_green)
-            (root.layoutParams as RecyclerView.LayoutParams).let {
+//            (root.layoutParams as RecyclerView.LayoutParams).let {
-//                it.bottomMargin = 15.dp
+////                it.bottomMargin = 15.dp
-                it.width = 226.dp
+//                it.width = 226.dp
-                it.height = 120.dp
+//                it.height = 120.dp
-//                it.rightMargin = 0
+////                it.rightMargin = 0
-//                it.leftMargin = if (position % 3 == 0) 0 else 15.dp
+////                it.leftMargin = if (position % 3 == 0) 0 else 15.dp
-
+//
-                it.leftMargin = 7.dp
+//                it.leftMargin = 7.dp
-                it.rightMargin = 8.dp
+//                it.rightMargin = 8.dp
-                it.topMargin = 7.dp
+//                it.topMargin = 7.dp
-                it.bottomMargin = 8.dp
+//                it.bottomMargin = 8.dp
-            }
+//            }
-            if (item.pageType == 1) {
+//            if (item.pageType == 1) {
-                root.clickWithDebounce { onCellClick?.invoke(position) }
+//                root.clickWithDebounce { onCellClick?.invoke(position) }
-            }
+//            }
-        }
+//        }
-    }
+//    }
-
+//
-    override fun getItemCount() = list.size
+//    override fun getItemCount() = list.size
-
+//
-    var onCellClick: ((positon: Int) -> Unit)? = null
+//    var onCellClick: ((positon: Int) -> Unit)? = null
-
+//
-    companion object {
+//    companion object {
-        fun loadLayout(frameLayout: FrameLayout, item: SeasoningEntity) {
+//        fun loadLayout(frameLayout: FrameLayout, item: SeasoningEntity) {
-            val child: TextView = frameLayout.getChildAt(0) as TextView
+//            val child: TextView = frameLayout.getChildAt(0) as TextView
-            child.text = getTextSpan(item)
+//            child.text = getTextSpan(item)
-        }
+//        }
-        fun loadCell(tvCell: TextView, item: SeasoningEntity) {
+//        fun loadCell(tvCell: TextView, item: SeasoningEntity) {
-            tvCell.text = getTextSpan(item)
+//            tvCell.text = getTextSpan(item)
-        }
+//        }
-//        fun loadCell2(tvCell: TextView, item: SeasoningEntity) {
+////        fun loadCell2(tvCell: TextView, item: SeasoningEntity) {
-//            if (item.goodsName.isNullOrBlank()) {
+////            if (item.goodsName.isNullOrBlank()) {
-//                tvCell.run {
+////                tvCell.run {
-//                    text = buildSpannableString {
+////                    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) {
+//////                    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("#999999".toColorInt()),
+//                    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 // 增加行间距
 //                    }
-//                        )}
+//                )
-//                    //setTextColor(ContextCompat.getColor(context, R.color.black999))
+//                append("\n")
-//                }
+//                val weight = item.useWeight ?: 0.toDouble()
-//            } else {
+//                val weightColor = if (weight == 0.toDouble()) "#999999" else "#00BC71"
-////                if (item.pageType == 1) {
+//                appendText(
-////                    tvCell.run {
+////                    "${DecimalFormat("#").format(weight)}g",
-////                        text = item.goodsName
+//                    "${weight.roundedOneDecimalPlace()}g",
-////                        setTextColor(ContextCompat.getColor(context, R.color.black))
+//                    ForegroundColorSpan(weightColor.toColorInt()),
-////                    }
+//                    AbsoluteSizeSpan(30, true)
-////                } 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.model.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
@@ -9,94 +10,82 @@ 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.http.HttpUtil
+import com.shuwei.dish.match.net.NetViewModel
-import com.shuwei.dish.match.http.UrlConfig
+import com.shuwei.dish.match.db.DbViewModel
-import com.shuwei.dish.match.ui.HomeActivity.Companion.TAG
 import com.shuwei.dish.match.ui.InitActivity
 import com.shuwei.dish.match.utils.ActivityManager
+import com.shuwei.dish.match.utils.KeyboardUtil
+import com.shuwei.dish.match.utils.ext.dp
 import com.shuwei.dish.match.utils.ext.gone
 import com.shuwei.dish.match.utils.ext.invisible
-import com.shuwei.dish.match.utils.ext.put
-import com.shuwei.dish.match.utils.ext.toast
 import com.shuwei.dish.match.utils.ext.visible
 import java.time.LocalDateTime
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import java.util.Locale
+import kotlin.getValue
 
-@Suppress("DEPRECATION")
 open class BaseActivity : AppCompatActivity() {
 
+    companion object {
+        const val TAG = "BaseActivity"
+        /** 日期时间格式化器，复用避免每秒重复创建 */
+        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() }
-    }
+        binding.root.setOnClickListener { hideKeyboard() }
-
-    private var bgState = true
-    fun useBackground(enable: Boolean) {
-        bgState = enable
     }
 
     override fun onDestroy() {
-        dismissLoading()
+        handler.removeCallbacksAndMessages(null)
+        // 只关闭自己弹出的 Loading，防止误关其他 Activity 的 Loading
+        Loading.dismissIfOwnedBy(this)
         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(
-        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)
@@ -106,12 +95,13 @@ open class BaseActivity : AppCompatActivity() {
         titleBarAction: ((FrameLayout) -> Unit)? = null,
         backAction: ((ImageView) -> Unit)? = null,
         titleAction: ((TextView) -> Unit)? = null,
-        rightIconActon: ((ImageView) -> Unit)? = null
+        rightIconAction: ((ImageView) -> Unit)? = null
     ) {
+        binding.llTitleBar.visible()
         titleBarAction?.invoke(binding.llTitleBar)
         backAction?.invoke(binding.ivBack)
         titleAction?.invoke(binding.tvTitle)
-        rightIconActon?.invoke(binding.ivRightIcon)
+        rightIconAction?.invoke(binding.ivRightIcon)
     }
 
     fun setHeaderBgVisible(show: Boolean) {
@@ -120,12 +110,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 +128,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,20 +153,127 @@ open class BaseActivity : AppCompatActivity() {
         handler.removeCallbacks(updateTask)
     }
 
-    fun showLoading() {
+    fun showLoading(msg: String = "加载中……", timeoutMs: Long = Loading.DEFAULT_TIMEOUT_MS) {
-        Loading.show(this)
+        handler.post {
+            Loading.show(
+                context = this,
+                message = msg,
+                timeoutMs = timeoutMs
+            )
+        }
     }
 
     fun dismissLoading() {
+        Log.d(TAG, "dismissLoading, ${this.javaClass.simpleName}")
+        handler.post {
             Loading.dismiss()
         }
+    }
 
     fun delayDismissLoading() {
-        window.decorView.postDelayed({
+        Log.d(TAG, "delayDismissLoading, ${this.javaClass.simpleName}")
+        handler.postDelayed({
             Loading.dismiss()
         }, 500)
     }
 
+    /**
+     * 在主线程延迟执行任务，供子类使用
+     * @param delayMs 延迟毫秒数
+     * @param block 待执行的任务
+     */
+    protected fun postDelayed(delayMs: Long, block: () -> Unit) {
+        handler.postDelayed(block, delayMs)
+    }
 
 
+    val netViewModel: NetViewModel by viewModels()
+    val dbViewModel: DbViewModel by viewModels()
+
+    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
+    ) {
+        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
+        }
+    }
+
+    fun hideKeyboard() {
+        KeyboardUtil.hideKeyboard(binding.root)
+    }
+
 }

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

@@ -1,14 +1,25 @@
 package com.shuwei.dish.match.base
 
+import android.app.Activity
 import android.app.Application
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.SharedPreferences
+import android.os.Bundle
+import android.util.Log
+import com.shuwei.dish.match.BuildConfig
 import com.shuwei.dish.match.R
 import com.shuwei.dish.match.db.DatabaseProvider
+import com.shuwei.dish.match.objbox.ObjectBox
+import com.shuwei.dish.match.scale.ScaleDeviceConfig
+import com.shuwei.dish.match.scale.ScaleServiceManager
+import com.shuwei.dish.match.utils.AppUtil
+import com.shuwei.dish.match.utils.SpTool
 import com.shuwei.dish.match.utils.BootReceiver
-
+import com.shuwei.dish.match.utils.CrashHandler
+import com.shuwei.dish.match.utils.WeightUtil
+import com.shuwei.dish.match.utils.Weigher2
 
 class BaseApp : Application() {
 
@@ -17,31 +28,72 @@ class BaseApp : Application() {
     override fun onCreate() {
         super.onCreate()
         instance = this
+        // 读取本地保存的环境地址，覆盖默认值
+        val savedBaseUrl = SpTool.baseUrl
+        if (savedBaseUrl.isNotEmpty()) {
+            GlobalData.appBaseUrl = savedBaseUrl
+        }
+        CrashHandler.init(this)
+        val deviceId = if (BuildConfig.IS_TEST_DEVICE) ScaleDeviceConfig.DEVICE_ID_2 else AppUtil.getUDID(this)
+        Log.d(TAG, "onCreate: deviceId=$deviceId, isTestDevice=${BuildConfig.IS_TEST_DEVICE}")
+        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)
+
+        // 初始化秤，进程级生命周期管理：最后一个 Activity 销毁时才停止读取
+        WeightUtil.init()
+        WeightUtil.getWeight()
+        WeightUtil.startContinuousRead()
+        registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks {
+            private var activityCount = 0
+            override fun onActivityCreated(a: Activity, b: Bundle?) { activityCount++ }
+            override fun onActivityDestroyed(a: Activity) {
+                if (--activityCount <= 0) {
+                    WeightUtil.stopContinuousRead()
+                }
+            }
+            override fun onActivityStarted(a: Activity) {}
+            override fun onActivityResumed(a: Activity) {}
+            override fun onActivityPaused(a: Activity) {}
+            override fun onActivityStopped(a: Activity) {}
+            override fun onActivitySaveInstanceState(a: Activity, b: Bundle) {}
+        })
+
+//        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"
         var canteenId = "0"
-        var configUrl = ""
-
-        var token: String? = null
-        var deviceId: String? = null
         var appVersion: String = "1"
         @Volatile
         private var sharedPref: SharedPreferences? = null
 
-        public var instance: BaseApp? = null
+        lateinit var instance: BaseApp
-        fun getSharedPref(): SharedPreferences? {
+
-            if (sharedPref != null) {
+        /** 双重检查锁，保证多线程下只初始化一次 */
-                return sharedPref
+        fun getSharedPref(): SharedPreferences {
+            return sharedPref ?: synchronized(this) {
+                sharedPref ?: instance.getSharedPreferences(
+                    instance.getString(R.string.sp_save_name),
+                    Context.MODE_PRIVATE
+                ).also { sharedPref = it }
             }
-            val saveName = instance?.getString(R.string.sp_save_name)
-            sharedPref = instance?.getSharedPreferences(saveName, Context.MODE_PRIVATE)
-            return sharedPref
         }
     }
 

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

@@ -0,0 +1,39 @@
+package com.shuwei.dish.match.base
+
+/**
+ * 设备角色枚举
+ * MASTER：主设备，负责汇聚所有设备的秤数据并展示大屏界面
+ * SLAVE：子设备，负责推送本机秤数据给主设备
+ */
+enum class DeviceRole { MASTER, SLAVE }
+
+object GlobalData {
+    var appBaseUrl: String = PROD_BASE_URL
+
+    /**
+     * 具体业务 BaseUrl
+     */
+    const val TEST_BASE_URL = "http://192.168.10.101:24801"
+    const val UAT_BASE_URL = "https://dev.yixiong-tech.com:8081"
+    const val PROD_BASE_URL = "https://platform-api.uat.shuziweidao.com"
+    /**
+     * 设备id
+     */
+    var deviceId: String = ""
+
+    /**
+     * 当前设备角色，启动时从 SpTool 读取，默认为 SLAVE
+     */
+    var deviceRole: DeviceRole = DeviceRole.SLAVE
+}
+
+/**
+ *
+ */
+object GlobalKey {
+    const val KEY_EQUIPMENT_INFO = "equipmentInfo"
+    const val KEY_TOKEN = "tokenKey"
+    const val KEY_USER_INFO = "userInfoKey"
+    const val KEY_USER_NAME = "userNameKey"
+    const val KEY_BASE_URL = "baseUrl"
+}

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.entity.CookFoodEntity
+import com.shuwei.dish.match.db.dao.CookFoodGoodsDao
-import com.shuwei.dish.match.entity.CookFoodGoodsEntity
+import com.shuwei.dish.match.db.dao.SeasoningDao
-import com.shuwei.dish.match.entity.SeasoningEntity
+import com.shuwei.dish.match.db.dao.SeasoningSlotDao
+import com.shuwei.dish.match.db.entity.CookFoodEntity
+import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
+import com.shuwei.dish.match.db.entity.SeasoningEntity
+import com.shuwei.dish.match.db.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 = 13,
     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,48 @@ 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")
+}
+
+/**
+ * 版本10→11：为 dm_cook_food_goods 和 dm_seasoning 表新增 goodsCode（物料编码）字段
+ */
+val MIGRATION_10_11 = MigrationImpl(10, 11) { db ->
+    db.execSQL("ALTER TABLE dm_cook_food_goods ADD COLUMN goodsCode TEXT DEFAULT ''")
+    db.execSQL("ALTER TABLE dm_seasoning ADD COLUMN goodsCode TEXT DEFAULT ''")
+}
+
+/**
+ * 版本11→12：为 dm_cook_food_goods 和 dm_seasoning 表新增 rawMaterialsType（净材种类）字段
+ */
+val MIGRATION_11_12 = MigrationImpl(11, 12) { db ->
+    db.execSQL("ALTER TABLE dm_cook_food_goods ADD COLUMN rawMaterialsType TEXT DEFAULT NULL")
+    db.execSQL("ALTER TABLE dm_seasoning ADD COLUMN rawMaterialsType TEXT DEFAULT NULL")
+}
+
+/**
+ * 版本12→13：为 dm_cook_food 表新增 submitState（接口提交状态）字段
+ * 0-未提交（本地草稿/手动删除），1-接口提交成功后删除
+ */
+val MIGRATION_12_13 = MigrationImpl(12, 13) { db ->
+    db.execSQL("ALTER TABLE dm_cook_food ADD COLUMN submitState INTEGER NOT NULL DEFAULT 0")
+}
+
 class DatabaseProvider(private val context: Context) {
     // 单例模式确保全局唯一实例‌
     val instance: AppDatabase by lazy {
@@ -210,6 +274,12 @@ 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)
+            .addMigrations(MIGRATION_10_11)
+            .addMigrations(MIGRATION_11_12)
+            .addMigrations(MIGRATION_12_13)
             .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,315 @@
+package com.shuwei.dish.match.db
+
+import com.shuwei.dish.match.base.BaseApp
+import com.shuwei.dish.match.db.entity.CookFoodEntity
+import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
+import com.shuwei.dish.match.db.entity.SeasoningEntity
+import com.shuwei.dish.match.db.entity.SeasoningSlotEntity
+import androidx.sqlite.db.SupportSQLiteQuery
+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, dinnerType: String) = withContext(Dispatchers.IO) {
+        db.cookFoodDao().getCookFoodById(BaseApp.canteenId, foodId, cookMode, dinnerType)
+    }
+
+    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, dinnerType: String) = withContext(Dispatchers.IO) {
+        db.cookFoodDao().deleteCookFood(BaseApp.canteenId, foodId, cookMode, dinnerType)
+    }
+
+    /** 接口提交成功后逻辑删除菜品，同时把 submitState 置 1 */
+    suspend fun markSubmittedAndDelete(foodId: String, cookMode: Int, dinnerType: String) = withContext(Dispatchers.IO) {
+        db.cookFoodDao().markSubmittedAndDelete(BaseApp.canteenId, foodId, cookMode, dinnerType)
+    }
+
+    suspend fun deleteCookFoodGoodsList(pid: Long, foodId: String) = withContext(Dispatchers.IO) {
+        db.cookFoodGoodsDao().deleteCookFoodGoodsList(pid, foodId)
+    }
+
+    /** 仅逻辑删除调料行（materialType = 3），主辅材不动 */
+    suspend fun deleteSeasoningOnly(pid: Long, foodId: String) = withContext(Dispatchers.IO) {
+        db.cookFoodGoodsDao().deleteSeasoningOnly(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()
+    }
+
+    // ---- 调试用：动态条件过滤分页查询 ----
+
+    suspend fun getCookFoodPagedFiltered(query: SupportSQLiteQuery) = withContext(Dispatchers.IO) {
+        db.cookFoodDao().queryPagedFiltered(query)
+    }
+
+    suspend fun countCookFoodFiltered(query: SupportSQLiteQuery) = withContext(Dispatchers.IO) {
+        db.cookFoodDao().countFiltered(query)
+    }
+
+    suspend fun getCookFoodGoodsPagedFiltered(query: SupportSQLiteQuery) = withContext(Dispatchers.IO) {
+        db.cookFoodGoodsDao().queryPagedFiltered(query)
+    }
+
+    suspend fun countCookFoodGoodsFiltered(query: SupportSQLiteQuery) = withContext(Dispatchers.IO) {
+        db.cookFoodGoodsDao().countFiltered(query)
+    }
+
+    suspend fun getSeasoningPagedFiltered(query: SupportSQLiteQuery) = withContext(Dispatchers.IO) {
+        db.seasoningDao().queryPagedFiltered(query)
+    }
+
+    suspend fun countSeasoningFiltered(query: SupportSQLiteQuery) = withContext(Dispatchers.IO) {
+        db.seasoningDao().countFiltered(query)
+    }
+
+    suspend fun getSlotPagedFiltered(query: SupportSQLiteQuery) = withContext(Dispatchers.IO) {
+        db.seasoningSlotDao().queryPagedFiltered(query)
+    }
+
+    suspend fun countSlotFiltered(query: SupportSQLiteQuery) = withContext(Dispatchers.IO) {
+        db.seasoningSlotDao().countFiltered(query)
+    }
+
+    /**
+     * 物理清空全部 4 张表的测试数据
+     * 清除顺序：先删子表（食材），再删主表（菜品），最后删配置表（调料、槽位）
+     */
+    suspend fun clearAllData() = withContext(Dispatchers.IO) {
+        db.cookFoodGoodsDao().deleteAll()
+        db.cookFoodDao().deleteAll()
+        db.seasoningDao().deleteAll()
+        db.seasoningSlotDao().deleteAll()
+    }
+}
+//
+//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,624 @@
+package com.shuwei.dish.match.db
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import androidx.sqlite.db.SimpleSQLiteQuery
+import com.shuwei.dish.match.model.CollectedFoodItem
+import com.shuwei.dish.match.db.entity.CookFoodEntity
+import com.shuwei.dish.match.objbox.ObjectBox
+import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
+import com.shuwei.dish.match.db.entity.SeasoningEntity
+import com.shuwei.dish.match.db.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, dinnerType: String) {
+        viewModelScope.launch {
+            _cookFoodDetailState.value = rep.getCookFoodById(foodId, cookMode, dinnerType)
+        }
+    }
+
+    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)
+        }
+    }
+
+    /**
+     * 查询本地烹饪中数据（回调版本），结果通过 onResult 直接回调，不经过 StateFlow
+     * 适合不需要跨生命周期持续监听的一次性查询场景
+     */
+    fun getCookFoodListWithCallback(
+        cookMode: Int,
+        dinnerType: String = "0",
+        onResult: (MutableList<CookFoodEntity>?) -> Unit
+    ) {
+        viewModelScope.launch {
+            onResult(rep.getCookFoodList(cookMode, dinnerType))
+        }
+    }
+
+    /**
+     * 直接返回本地烹饪中数据，供需要串行等待结果的场景使用（如先查库再发网络请求）
+     */
+    suspend fun getCookFoodListDirect(
+        cookMode: Int,
+        dinnerType: String = "0"
+    ): MutableList<CookFoodEntity>? {
+        return 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, entity.dinnerType ?: "0")
+        if (data == null) {
+            // 首次保存：主表 + 主辅材 + 调料 全量 insert
+            rep.insertCookFood(entity)
+            val newData = rep.getCookFoodById(entity.foodId, cookMode, entity.dinnerType ?: "0")
+            // 回填 id，防止下次调用时 getCookFoodById 查不到而重复插入主辅材
+            newData?.let { entity.id = it.id }
+            list?.let {
+                it.forEach { goods ->
+                    goods.id = 0
+                    goods.pid = newData?.id ?: 0
+                }
+                rep.insertGoodsList(it)
+            }
+        } else {
+            // 已存在：主表与主辅材保持不变，仅重建调料部分，避免主表/主辅材累积逻辑删除脏数据
+            rep.deleteSeasoningOnly(data.id, entity.foodId)
+            val seasoningList = list?.filter { it.materialType == 3 }?.toMutableList()
+            if (!seasoningList.isNullOrEmpty()) {
+                seasoningList.forEach { goods ->
+                    goods.id = 0
+                    goods.pid = data.id
+                    goods.foodId = entity.foodId
+                }
+                rep.insertGoodsList(seasoningList)
+            }
+        }
+    }
+
+    suspend fun deleteCookFoodAndGoods(cookMode: Int, foodId: String, dinnerType: String) {
+        val data = rep.getCookFoodById(foodId, cookMode, dinnerType)
+        if (data != null) {
+            rep.deleteCookFood(foodId = foodId, cookMode = cookMode, dinnerType = dinnerType)
+            rep.deleteCookFoodGoodsList(pid = data.id, foodId = foodId)
+        }
+    }
+
+    /**
+     * 接口提交成功后删除本地菜品草稿（异步版本，绑定 viewModelScope）
+     * 与 [markSubmittedAndDelete] 的区别：不是 suspend，内部用 viewModelScope 启动协程，
+     * 不受调用方 Activity 生命周期影响，适合 singleTask 跳转前触发删除的场景
+     */
+    fun markSubmittedAndDeleteAsync(cookMode: Int, foodId: String, dinnerType: String) {
+        viewModelScope.launch {
+            markSubmittedAndDelete(cookMode, foodId, dinnerType)
+        }
+    }
+
+    /**
+     * 接口提交成功后删除本地菜品草稿
+     * 与 [deleteCookFoodAndGoods] 的区别：主表 submitState 会被置 1，便于审计区分手动删除与接口删除
+     */
+    suspend fun markSubmittedAndDelete(cookMode: Int, foodId: String, dinnerType: String) {
+        val data = rep.getCookFoodById(foodId, cookMode, dinnerType)
+        if (data != null) {
+            rep.markSubmittedAndDelete(foodId = foodId, cookMode = cookMode, dinnerType = dinnerType)
+            rep.deleteCookFoodGoodsList(pid = data.id, foodId = foodId)
+        }
+    }
+
+    //--------------------------------------------------------------------------------------------------------
+
+    suspend fun getCookFoodGoodsList(
+        foodId: String,
+        cookMode: Int,
+        dinnerType: String
+    ): MutableList<CookFoodGoodsEntity> {
+        val cookFood = rep.getCookFoodById(foodId, cookMode, dinnerType)
+        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)
+
+    // ---- 数据库调试查看 ----
+
+    /**
+     * 物理清空全部 4 张表的测试数据，完成后通过回调通知 UI
+     * @param onDone 清除完成后在主线程执行的回调
+     */
+    fun clearAllData(onDone: () -> Unit) {
+        viewModelScope.launch {
+            rep.clearAllData()
+            onDone()
+        }
+    }
+
+    companion object {
+        /** 每页加载条数 */
+        const val DB_INSPECT_PAGE_SIZE = 50
+    }
+
+    /**
+     * 单条数据库记录的展示模型
+     * @param isDel 是否已逻辑删除
+     * @param fields 字段名-值对列表，按顺序排列
+     * @param columnsPerRow 每行显示的列数，默认 3；槽位表传 1 保持单列
+     */
+    data class DbRecord(
+        val isDel: Boolean,
+        val fields: List<Pair<String, String>>,
+        val columnsPerRow: Int = 3
+    )
+
+    /**
+     * 数据库调试页面 UI 状态
+     * @param items 当前已加载的记录列表
+     * @param totalCount 当前过滤条件下的总记录数
+     * @param hasMore 是否还有更多数据可加载
+     * @param isLoading 是否正在加载（首次加载或加载更多）
+     * @param filter 当前生效的筛选条件，供"加载更多"复用
+     */
+    data class DbInspectUiState(
+        val items: List<DbRecord> = emptyList(),
+        val totalCount: Int = 0,
+        val hasMore: Boolean = false,
+        val isLoading: Boolean = false,
+        val filter: DbInspectFilter = DbInspectFilter()
+    )
+
+    /**
+     * 数据库调试页面筛选条件
+     * @param showDel 是否包含已删除记录
+     * @param exactFields 精确匹配字段：列名 → 值
+     * @param likeFields  模糊匹配字段：列名 → 值（自动加 %value%）
+     */
+    data class DbInspectFilter(
+        val showDel: Boolean = true,
+        val exactFields: Map<String, String> = emptyMap(),
+        val likeFields: Map<String, String> = emptyMap()
+    )
+
+    private val _dbInspectState = MutableStateFlow(DbInspectUiState())
+    val dbInspectState: StateFlow<DbInspectUiState> = _dbInspectState.asStateFlow()
+
+    /**
+     * 加载指定表的第一页数据（切换 Tab / 修改筛选条件时调用）
+     * @param tableIndex 0=菜品 1=食材 2=调料 3=槽位
+     * @param filter 筛选条件，包含 showDel 和各字段过滤值
+     */
+    fun loadDbInspect(tableIndex: Int, filter: DbInspectFilter) {
+        viewModelScope.launch {
+            // 立即清空旧数据并显示加载状态，避免切换 Tab 时旧数据闪现
+            _dbInspectState.value = DbInspectUiState(isLoading = true, filter = filter)
+            val (items, total) = queryPage(tableIndex, filter, offset = 0)
+            _dbInspectState.value = DbInspectUiState(
+                items = items,
+                totalCount = total,
+                hasMore = items.size < total,
+                isLoading = false,
+                filter = filter
+            )
+        }
+    }
+
+    /**
+     * 追加加载下一页数据（点击"加载更多"时调用）
+     * 筛选条件从当前 state 中复用，无需重新传入
+     * @param tableIndex 0=菜品 1=食材 2=调料 3=槽位
+     */
+    fun loadMoreDbInspect(tableIndex: Int) {
+        viewModelScope.launch {
+            val current = _dbInspectState.value
+            // 已在加载中或无更多数据时直接返回，防止重复请求
+            if (!current.hasMore || current.isLoading) return@launch
+            _dbInspectState.value = current.copy(isLoading = true)
+            val (newItems, total) = queryPage(tableIndex, current.filter, offset = current.items.size)
+            val merged = current.items + newItems
+            _dbInspectState.value = DbInspectUiState(
+                items = merged,
+                totalCount = total,
+                hasMore = merged.size < total,
+                isLoading = false,
+                filter = current.filter
+            )
+        }
+    }
+
+    /**
+     * 执行分页查询，返回 DbRecord 列表和总记录数
+     * 通过 buildQueries 将 filter 转换为动态 SQL
+     */
+    private suspend fun queryPage(
+        tableIndex: Int,
+        filter: DbInspectFilter,
+        offset: Int
+    ): Pair<List<DbRecord>, Int> {
+        val limit = DB_INSPECT_PAGE_SIZE
+        return when (tableIndex) {
+            0 -> {
+                val (pageQ, countQ) = buildQueries("dm_cook_food", "createTime DESC", true, filter, limit, offset)
+                val total = rep.countCookFoodFiltered(countQ)
+                val rows = rep.getCookFoodPagedFiltered(pageQ).map { e ->
+                    DbRecord(
+                        isDel = e.isDel == 1,
+                        fields = listOf(
+                            "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}", "submitState" to "${e.submitState}",
+                            "createTime" to "${e.createTime}"
+                        )
+                    )
+                }
+                rows to total
+            }
+            1 -> {
+                val (pageQ, countQ) = buildQueries("dm_cook_food_goods", "createTime DESC", true, filter, limit, offset)
+                val total = rep.countCookFoodGoodsFiltered(countQ)
+                val rows = rep.getCookFoodGoodsPagedFiltered(pageQ).map { e ->
+                    DbRecord(
+                        isDel = e.isDel == 1,
+                        fields = listOf(
+                            "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 (pageQ, countQ) = buildQueries("dm_seasoning", "sort ASC", true, filter, limit, offset)
+                val total = rep.countSeasoningFiltered(countQ)
+                val rows = rep.getSeasoningPagedFiltered(pageQ).map { e ->
+                    DbRecord(
+                        isDel = e.isDel == 1,
+                        fields = listOf(
+                            "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 (pageQ, countQ) = buildQueries("dm_seasoning_slot", "deviceId ASC, address ASC", false, filter, limit, offset)
+                val total = rep.countSlotFiltered(countQ)
+                val rows = rep.getSlotPagedFiltered(pageQ).map { e ->
+                    DbRecord(
+                        isDel = false,
+                        fields = listOf(
+                            "deviceId" to e.deviceId, "address" to "${e.address}",
+                            "goodsId" to e.goodsId, "goodsName" to e.goodsName
+                        ),
+                        columnsPerRow = 1
+                    )
+                }
+                rows to total
+            }
+            else -> emptyList<DbRecord>() to 0
+        }
+    }
+
+    /**
+     * 根据筛选条件动态构建分页查询和计数查询的 SQL
+     * @param tableName 表名
+     * @param orderBy   ORDER BY 子句（不含关键字）
+     * @param hasIsDel  是否有 isDel 字段，无则忽略 showDel 参数
+     * @param filter    筛选条件
+     * @param limit     分页大小
+     * @param offset    偏移量
+     * @return Pair<分页查询, 计数查询>
+     */
+    private fun buildQueries(
+        tableName: String,
+        orderBy: String,
+        hasIsDel: Boolean,
+        filter: DbInspectFilter,
+        limit: Int,
+        offset: Int
+    ): Pair<SimpleSQLiteQuery, SimpleSQLiteQuery> {
+        val conditions = mutableListOf<String>()
+        val args = mutableListOf<Any>()
+
+        if (hasIsDel && !filter.showDel) {
+            conditions.add("isDel = 0")
+        }
+        filter.exactFields.forEach { (col, value) ->
+            if (value.isNotBlank()) {
+                conditions.add("$col = ?")
+                args.add(value)
+            }
+        }
+        filter.likeFields.forEach { (col, value) ->
+            if (value.isNotBlank()) {
+                conditions.add("$col LIKE ?")
+                args.add("%$value%")
+            }
+        }
+
+        val where = if (conditions.isEmpty()) "" else "WHERE ${conditions.joinToString(" AND ")}"
+        val pageQuery = SimpleSQLiteQuery(
+            "SELECT * FROM $tableName $where ORDER BY $orderBy LIMIT ? OFFSET ?",
+            (args + limit + offset).toTypedArray()
+        )
+        val countQuery = SimpleSQLiteQuery(
+            "SELECT COUNT(*) FROM $tableName $where",
+            args.toTypedArray()
+        )
+        return pageQuery to countQuery
+    }
+
+    //--------------------------------------------------------------------------------------------------------
+
+//        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)
+        }
+    }
+
+    /**
+     * 清除所有向量采集数据，完成后刷新列表
+     * @param onDone 清除完成后在主线程执行的回调
+     */
+    fun clearAllCollectedFood(onDone: (() -> Unit)? = null) {
+        viewModelScope.launch {
+            ObjectBox.removeAll()
+            loadCollectedFoodList()
+            onDone?.invoke()
+        }
+    }
+
+    //--------------------------------------------------------------------------------------------------------
+}

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,61 @@
-//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.RawQuery
-//@Dao
+import androidx.room.Update
-//interface CookFoodDao : BaseDao<CookFoodEntity> {
+import androidx.sqlite.db.SupportSQLiteQuery
-//
+import com.shuwei.dish.match.db.entity.CookFoodEntity
-//    @Query("SELECT * FROM dm_cook_food WHERE isDel = 0 AND foodId = :foodId AND cookMode = :cookMode")
+
-//    suspend fun getCookFoodById(foodId: String, cookMode:Int): CookFoodEntity?
+@Dao
-//
+interface CookFoodDao {
-//    @Query("SELECT * FROM dm_cook_food WHERE isDel = 0 AND cookMode = :cookMode")
+
-//    suspend fun getCookFoodList(cookMode:Int): MutableList<CookFoodEntity>?
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
-//
+    suspend fun insertCookFood(item: CookFoodEntity): Long
-//    @Query("SELECT count(1) FROM dm_cook_food WHERE isDel = 0 AND cookMode = :cookMode")
+
-//    suspend fun countCookFood(cookMode:Int): Int
+    @Update
-//
+    suspend fun updateCookFood(item: CookFoodEntity)
-//}
+
+    @Query("SELECT * FROM dm_cook_food WHERE isDel = 0 AND canteenId = :canteenId AND foodId = :foodId AND cookMode = :cookMode AND dinnerType = :dinnerType")
+    suspend fun getCookFoodById(canteenId: String, foodId: String, cookMode: Int, dinnerType: String): 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 AND dinnerType = :dinnerType")
+    suspend fun deleteCookFood(canteenId: String, foodId: String, cookMode: Int, dinnerType: String)
+
+    /** 接口提交成功后逻辑删除菜品，同时把 submitState 置 1 以便在数据库审计中区分手动删除 */
+    @Query("UPDATE dm_cook_food SET isDel = 1, submitState = 1 WHERE isDel = 0 AND canteenId = :canteenId AND foodId = :foodId AND cookMode = :cookMode AND dinnerType = :dinnerType")
+    suspend fun markSubmittedAndDelete(canteenId: String, foodId: String, cookMode: Int, dinnerType: String)
+
+    /** 查询全部菜品记录（含已删除），用于数据库调试查看 */
+    @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
+
+    /** 物理清空全表，用于清除测试数据 */
+    @Query("DELETE FROM dm_cook_food")
+    suspend fun deleteAll()
+
+    /** 动态条件分页查询菜品记录，由 ViewModel 构建 SQL */
+    @RawQuery
+    suspend fun queryPagedFiltered(query: SupportSQLiteQuery): List<CookFoodEntity>
+
+    /** 动态条件统计菜品记录总数，由 ViewModel 构建 SQL */
+    @RawQuery
+    suspend fun countFiltered(query: SupportSQLiteQuery): Int
+}

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

@@ -1,29 +1,61 @@
-//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.RawQuery
-//@Dao
+import androidx.room.Update
-//interface CookFoodGoodsDao : BaseDao<CookFoodGoodsEntity> {
+import androidx.sqlite.db.SupportSQLiteQuery
-//
+import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
-//    @Query("SELECT * FROM dm_cook_food_goods WHERE isDel = 0 AND foodId = :foodId")
+
-//    suspend fun getCookFoodGoodsList(foodId: String): MutableList<CookFoodGoodsEntity>
+@Dao
-//
+interface CookFoodGoodsDao {
-//    @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>
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
-//
+    suspend fun insertGoods(item: CookFoodGoodsEntity): Long
-////    @Query(
+
-////        """
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
-////        UPDATE dm_cook_food_goods
+    suspend fun insertGoodsList(items: MutableList<CookFoodGoodsEntity>): Array<Long>
-////        SET goodsName=:entity.goodsName, foodId=:entity.foodId, relateionType=:entity.relateionType, sort=:entity.sort
+
-////            allEdible=:entity.allEdible, useWeight=:entity.useWeight, isDel=:entity.isDel, createTime=:entity.createTime
+    @Update
-////        WHERE isDel = 0
+    suspend fun updateGoods(item: CookFoodGoodsEntity)
-////        AND foodId=:entity.foodId
+
-////        AND goodsId=:goodsId
+    @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>
-////    )
+
-////    fun updateByGoodsId(entity: 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")
+    @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)
+
+    /** 仅逻辑删除调料行（materialType = 3），主辅材不动，用于 cook 时只重建调料部分 */
+    @Query("UPDATE dm_cook_food_goods SET isDel = 1 WHERE isDel = 0 AND pid = :pid AND foodId = :foodId AND materialType = 3")
+    suspend fun deleteSeasoningOnly(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
+
+    /** 物理清空全表，用于清除测试数据 */
+    @Query("DELETE FROM dm_cook_food_goods")
+    suspend fun deleteAll()
+
+    /** 动态条件分页查询食材记录，由 ViewModel 构建 SQL */
+    @RawQuery
+    suspend fun queryPagedFiltered(query: SupportSQLiteQuery): List<CookFoodGoodsEntity>
+
+    /** 动态条件统计食材记录总数，由 ViewModel 构建 SQL */
+    @RawQuery
+    suspend fun countFiltered(query: SupportSQLiteQuery): Int
+}

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

@@ -1,25 +1,70 @@
-//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.RawQuery
-//
+import androidx.room.Update
-//@Dao
+import androidx.sqlite.db.SupportSQLiteQuery
-//interface SeasoningDao : BaseDao<SeasoningEntity> {
+import com.shuwei.dish.match.db.entity.SeasoningEntity
-//
+
-////    @Query("SELECT * FROM dm_seasoning WHERE isDel = 0 AND id = :id")
+@Dao
-////    suspend fun getSeasoningById(id: Long): SeasoningEntity?
+interface SeasoningDao {
-////
+
-////    @Query("SELECT * FROM dm_seasoning WHERE isDel = 0 ORDER BY sort ASC")
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
-////    fun getAllStream(): Flow<MutableList<SeasoningEntity>>
+    suspend fun insertSeasoning(item: SeasoningEntity): Long
-////
+
-////    @Query("SELECT * FROM dm_seasoning WHERE isDel = 0 AND  name LIKE '%' || :query || '%'")
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
-////    suspend fun search(query: String): MutableList<SeasoningEntity>
+    suspend fun insertSeasoningList(items: MutableList<SeasoningEntity>): Array<Long>
-////
+
-////    @Query("DELETE FROM dm_seasoning WHERE rowid IN " +
+    @Update
-////            "(SELECT rowid FROM dm_seasoning LIMIT 1000)")
+    suspend fun updateSeasoning(item: SeasoningEntity)
-////    suspend fun deleteBatch(): Int
+
-//
+    @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: 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
+
+    /** 物理清空全表，用于清除测试数据（比 clearAllSeasoning 的逻辑删除更彻底） */
+    @Query("DELETE FROM dm_seasoning")
+    suspend fun deleteAll()
+
+    /** 动态条件分页查询调料记录，由 ViewModel 构建 SQL */
+    @RawQuery
+    suspend fun queryPagedFiltered(query: SupportSQLiteQuery): List<SeasoningEntity>
+
+    /** 动态条件统计调料记录总数，由 ViewModel 构建 SQL */
+    @RawQuery
+    suspend fun countFiltered(query: SupportSQLiteQuery): Int
+}

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

@@ -0,0 +1,77 @@
+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.RawQuery
+import androidx.sqlite.db.SupportSQLiteQuery
+import com.shuwei.dish.match.db.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)
+
+    /** 物理清空全表，用于清除测试数据 */
+    @Query("DELETE FROM dm_seasoning_slot")
+    suspend fun deleteAll()
+
+    /** 动态条件分页查询槽位记录，由 ViewModel 构建 SQL */
+    @RawQuery
+    suspend fun queryPagedFiltered(query: SupportSQLiteQuery): List<SeasoningSlotEntity>
+
+    /** 动态条件统计槽位记录总数，由 ViewModel 构建 SQL */
+    @RawQuery
+    suspend fun countFiltered(query: SupportSQLiteQuery): Int
+}

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

@@ -1,4 +1,4 @@
-package com.shuwei.dish.match.entity
+package com.shuwei.dish.match.db.entity
 
 import androidx.room.Entity
 import androidx.room.Ignore
@@ -18,11 +18,17 @@ data class CookFoodEntity(
     //0-制作模式，1-采样模式，2-品控模式
     var cookMode:Int = 0,
     var isDel: Int = 0,
+    /** 接口提交状态：0-未提交（本地草稿或手动删除）,1-接口提交成功后删除 */
+    var submitState: Int = 0,
     var createTime: String = DateTimeUtil.formatDateTime(LocalDateTime.now()),
     var dinnerType: String? = "0",
 ) : BaseEntity {
+//    @Ignore
+//    var stFoodInfoConstituteList: MutableList<CookFoodGoodsEntity>? = null
     @Ignore
-    var stFoodInfoConstituteList: MutableList<CookFoodGoodsEntity>? = null
+    var matchingConstituteInfoList: MutableList<CookFoodGoodsEntity>? = null
+    @Ignore
+    var foodConstituteList: MutableList<CookFoodGoodsEntity>? = null
 
     constructor() : this(foodId = "") // 必需的空构造
 }

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

@@ -1,9 +1,9 @@
-package com.shuwei.dish.match.entity
+package com.shuwei.dish.match.db.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.model.GoodsItem
 import com.shuwei.dish.match.utils.DateTimeUtil
 import java.io.Serializable
 import java.time.LocalDateTime
@@ -43,10 +43,14 @@ class CookFoodGoodsEntity(
      */
     var materialType: Int = 0,
 
+//    /**
+//     * 物品 是否全部可食：1-全部可食，0-部分可食，默认全部
+//     */
+//    var allEdible: Int = 1,
     /**
-     * 物品 是否全部可食：1-全部可食，0-部分可食，默认全部
+     * 物品 是否全部可食：true-全部可食，false-部分可食，默认全部
      */
-    var allEdible: Int = 1,
+    var allEdible: Boolean = true,
 
     /**
      * 物品 用料重量
@@ -59,23 +63,36 @@ class CookFoodGoodsEntity(
 
     var relateionType_dictText: String? = "",
 
+    var zjmCode: String? = "",
+
+    var materId: String? = "",
+
+    /** 物料编码 */
+    var goodsCode: String? = "",
+
+    /** 净材种类 */
+    var rawMaterialsType: String? = null,
+
     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
+        materCode = goodsCode,
-    var isNewDishType: Boolean = false
+        materialType = materialType,
-
+        useWeight = useWeight,
-    @Ignore
+        relateionType = relateionType,
-    var isClicked: Boolean = false
+        allEdible = allEdible,
+        goodsOrRelationCode = goodsOrRelationCode,
+        rawMaterialsType = rawMaterialsType
+    )
 }

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

@@ -1,7 +1,6 @@
-package com.shuwei.dish.match.entity
+package com.shuwei.dish.match.db.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
@@ -36,11 +35,14 @@ data class SeasoningEntity(
      */
     var materialType: Int = 3,
 
+//    /**
+//     * 物品 是否全部可食：1-全部可食，0-部分可食，默认全部
+//     */
+//    var allEdible: Int = 1,
     /**
-     * 物品 是否全部可食：1-全部可食，0-部分可食，默认全部
+     * 物品 是否全部可食：true-全部可食，false-部分可食，默认全部
      */
-    var allEdible: Int = 1,
+    var allEdible: Boolean = true,
-
     /**
      * 物品 用料重量
      */
@@ -52,6 +54,16 @@ data class SeasoningEntity(
 
     var relateionType_dictText: String? = "",
 
+    var zjmCode: String? = "",
+
+    var materId: String? = "",
+
+    /** 物料编码 */
+    var goodsCode: String? = "",
+
+    /** 净材种类 */
+    var rawMaterialsType: String? = null,
+
     var sort: Int = 9999,
     /**
     * isDel表示数据是否已删除，1-已删除，为无效数据，0-正常使用，有效数据
@@ -59,11 +71,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/db/entity/SeasoningSlotEntity.kt

@@ -0,0 +1,23 @@
+package com.shuwei.dish.match.db.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/dialog/BottomDialog.kt

@@ -1,201 +0,0 @@
-package com.shuwei.dish.match.dialog
-
-import android.annotation.SuppressLint
-import android.os.Handler
-import android.os.Looper
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import androidx.core.view.isEmpty
-import androidx.core.widget.addTextChangedListener
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.shuwei.dish.match.R
-import com.shuwei.dish.match.adapter.GoodsInfoSearchAdapter
-import com.shuwei.dish.match.base.BaseActivity
-import com.shuwei.dish.match.base.BaseApp
-import com.shuwei.dish.match.databinding.DialogBottomSheetBinding
-import com.shuwei.dish.match.entity.CookFoodGoodsEntity
-import com.shuwei.dish.match.entity.GoodsRecordBean
-import com.shuwei.dish.match.http.HttpUtil
-import com.shuwei.dish.match.http.UrlConfig
-import com.shuwei.dish.match.utils.KeyboardUtil
-import com.shuwei.dish.match.utils.ext.addOnActionSearchListener
-import com.shuwei.dish.match.utils.ext.toJsonString
-import com.shuwei.dish.match.utils.ext.toObject
-import com.shuwei.dish.match.utils.ext.toast
-
-/**
- * @param goodsType 1-调料，0-食材
- */
-class BottomDialog(
-    private var goodsType: Int = 1,
-    private var defGoodsName:String? = null
-) {
-    companion object {
-        const val TAG = "BottomDialog"
-    }
-
-    private var list = mutableListOf<CookFoodGoodsEntity>()
-
-    private lateinit var binding: DialogBottomSheetBinding
-    private lateinit var goodsInfoSearchAdapter: GoodsInfoSearchAdapter
-    private var goodsName: String? = null
-
-    private var activity: BaseActivity? = null
-
-    fun show(activity: BaseActivity, callback: (item: CookFoodGoodsEntity) -> Unit) {
-        this.activity = activity
-        //直接使用BottomSheetDialog
-        var dialog: BottomSheetDialog? = null
-        val inflater = LayoutInflater.from(activity)
-        binding = DialogBottomSheetBinding.inflate(inflater)
-
-        binding.tvSheetName.text = if (goodsType == 1) "调料检索" else "食材检索"
-        binding.etSheetInput.hint = if (goodsType == 1) "输入调料名称" else "输入食材名称或速记码"
-        goodsInfoSearchAdapter = GoodsInfoSearchAdapter(list).apply {
-            setOnItemClickListener { _, _, position ->
-                list[position].isClicked = true
-                notifyItemChanged(position)
-                Handler(Looper.getMainLooper()).postDelayed({
-                    callback(list[position])
-                    dialog?.dismiss()
-                }, 300)
-            }
-        }
-        binding.recyclerView.run {
-            layoutManager = GridLayoutManager(activity, 2, GridLayoutManager.VERTICAL, false)
-            adapter = goodsInfoSearchAdapter
-            addOnScrollListener(object : RecyclerView.OnScrollListener() {
-                override fun onScrollStateChanged(rv: RecyclerView, newState: Int) {
-                    super.onScrollStateChanged(rv, newState);
-                }
-
-                override fun onScrolled(rv: RecyclerView, dx: Int, dy: Int) {
-                    //解决RecyclerView和smartRefreshLayout滑动冲突问题
-                    super.onScrolled(rv, dx, dy)
-                    val topRowVerticalPosition = if (rv.isEmpty()) 0 else rv.getChildAt(0).top
-                    binding.refreshLayout.setNestedScrollingEnabled(topRowVerticalPosition >= 0)
-                }
-            })
-        }
-        dialog = BottomSheetDialog(activity, R.style.BottomSheet).apply {
-            setContentView(binding.root)
-            setCancelable(true)
-            behavior.skipCollapsed = false // 跳过折叠状态
-//            behavior.peekHeight = 880.dp
-//            window?.setLayout(-1, 880.dp)
-            show()
-            setOnDismissListener {
-                activity.hideStatusBar()
-            }
-        }
-        binding.refreshLayout.setOnRefreshListener {
-            pageNo = 1
-            getGoodsList()
-        }
-
-        binding.refreshLayout.setOnLoadMoreListener {
-            getGoodsList()
-        }
-        binding.etSheetInput.addTextChangedListener(
-            onTextChanged = { text, start, before, count ->
-                goodsName = text.toString()
-            })
-        binding.ivSearch.setOnClickListener { v ->
-            searchGoods(v)
-        }
-        binding.root.setOnClickListener { v ->
-            KeyboardUtil.hideKeyboard(v.context, v)
-        }
-        binding.etSheetInput.let { v ->
-            v.addOnActionSearchListener {
-                searchGoods(v)
-            }
-        }
-        binding.refreshLayout.setEnableRefresh(false)
-        binding.refreshLayout.setEnableLoadMore(false)
-
-        if (defGoodsName.isNullOrBlank().not()) {
-            binding.etSheetInput.let {
-                it.setText(defGoodsName)
-                searchGoods(it)
-            }
-        }
-    }
-
-    private fun searchGoods(v: View) {
-        if (goodsName.isNullOrBlank()) {
-            activity?.toast("请${binding.etSheetInput.hint}")
-            return
-        }
-        pageNo = 1
-        getGoodsList()
-        KeyboardUtil.hideKeyboard(v.context, v)
-    }
-
-    private var pageNo = 1
-    private val pageSize = 120
-
-    /**
-     */
-    @SuppressLint("NotifyDataSetChanged")
-    private fun getGoodsList() {
-//        val pathSegmentList = UrlConfig.QUERY_GOODS_LIST.split(delimiters = arrayOf("/"), limit = 1)
-        val queryParams = mutableMapOf(
-            "goodsType" to "$goodsType",
-            "canteenId" to BaseApp.canteenId,
-            "pageNo" to "$pageNo",
-            "pageSize" to "$pageSize"
-        )
-        if (goodsName.isNullOrBlank().not()) {
-            queryParams.put("name", goodsName!!)
-        }
-        val sb = StringBuilder().apply {
-            append(UrlConfig.QUERY_GOODS_LIST)
-            append("?")
-            queryParams.forEach { (key, value) ->
-                append("$key=$value&")
-            }
-        }
-        sb.deleteCharAt(sb.length - 1)
-        Log.d(TAG, "getGoodsList: url = $sb")
-        HttpUtil.get(
-            url = sb.toString(),
-            doSuccess = {
-                val json = it.toJsonString()
-                Log.d(TAG, "getGoodsList: json=$json")
-                val recordBean: GoodsRecordBean? = json.toObject<GoodsRecordBean>()
-                if (recordBean == null || recordBean.records.isNullOrEmpty()) {
-                    activity?.toast(if (goodsType == 1) "暂未搜索到调料信息" else "暂未搜索到食材信息")
-                    return@get
-                }
-                val records = recordBean.records
-                if (pageNo == 1) {
-                    list.clear()
-                }
-                list.addAll(records!!)
-                goodsInfoSearchAdapter.notifyDataSetChanged()
-                if (pageNo == 1) {
-                    binding.refreshLayout.finishRefresh(1200)
-                } else {
-                    binding.refreshLayout.finishLoadMore(1200)
-                }
-                val isLoadMoreEnable = records.size >= pageSize
-                binding.refreshLayout.setEnableLoadMore(isLoadMoreEnable)
-                if (isLoadMoreEnable) {
-                    pageNo++
-                }
-            }, doFailure = { code, msg ->
-                activity?.toast(msg)
-                if (pageNo == 1) {
-                    binding.refreshLayout.finishRefresh(1200)
-                } else {
-                    binding.refreshLayout.finishLoadMore(1200)
-                }
-            })
-    }
-
-}
-

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

@@ -1,258 +0,0 @@
-package com.shuwei.dish.match.dialog
-
-import android.annotation.SuppressLint
-import android.graphics.Typeface
-import android.os.Handler
-import android.os.Looper
-import android.text.SpannableStringBuilder
-import android.text.style.AbsoluteSizeSpan
-import android.text.style.ForegroundColorSpan
-import android.text.style.LineHeightSpan
-import android.text.style.StyleSpan
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import androidx.core.graphics.toColorInt
-import androidx.core.view.isEmpty
-import androidx.core.widget.addTextChangedListener
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.shuwei.dish.match.R
-import com.shuwei.dish.match.adapter.SeasoningSearchAdapter
-import com.shuwei.dish.match.base.BaseActivity
-import com.shuwei.dish.match.base.BaseApp
-import com.shuwei.dish.match.databinding.DialogBottomSheet2Binding
-import com.shuwei.dish.match.entity.SeasoningEntity
-import com.shuwei.dish.match.entity.SeasoningRecordBean
-import com.shuwei.dish.match.http.HttpUtil
-import com.shuwei.dish.match.http.UrlConfig
-import com.shuwei.dish.match.utils.KeyboardUtil
-import com.shuwei.dish.match.utils.WeightUtil
-import com.shuwei.dish.match.utils.ext.addOnActionSearchListener
-import com.shuwei.dish.match.utils.ext.appendText
-import com.shuwei.dish.match.utils.ext.buildSpannableString
-import com.shuwei.dish.match.utils.ext.dp
-import com.shuwei.dish.match.utils.ext.roundedDecimalPlace
-import com.shuwei.dish.match.utils.ext.roundedOneDecimalPlace
-import com.shuwei.dish.match.utils.ext.toJsonString
-import com.shuwei.dish.match.utils.ext.toObject
-import com.shuwei.dish.match.utils.ext.toast
-
-/**
- * @param goodsType 1-调料，0-食材
- */
-class BottomDialog2(
-    private var weighIndex: Int,
-    private var weighAddress: Int,
-    private var clickName: String? = null
-) {
-    companion object {
-        const val TAG = "BottomDialog2"
-    }
-
-    private val goodsType: Int = 1
-    private var list = mutableListOf<SeasoningEntity>()
-
-    private lateinit var binding: DialogBottomSheet2Binding
-    private lateinit var searchAdapter: SeasoningSearchAdapter
-    private var goodsName: String? = null
-
-    private var activity: BaseActivity? = null
-
-    fun show(activity: BaseActivity, callback: (item: SeasoningEntity) -> Unit) {
-        this.activity = activity
-        //直接使用BottomSheetDialog
-        var dialog: BottomSheetDialog? = null
-        val inflater = LayoutInflater.from(activity)
-        binding = DialogBottomSheet2Binding.inflate(inflater)
-
-        //binding.tvSheetName.text = if (goodsType == 1) "调料检索" else "食材检索"
-        binding.etSheetInput.hint = if (goodsType == 1) "输入调料名称" else "输入食材名称或速记码"
-        searchAdapter = SeasoningSearchAdapter(list).apply {
-            setOnItemClickListener { _, _, position ->
-                list[position].isClicked = true
-                notifyItemChanged(position)
-                Handler(Looper.getMainLooper()).postDelayed({
-                    callback(list[position].also { it.useWeight = currentWeight })
-                    dialog?.dismiss()
-                }, 300)
-            }
-        }
-        binding.recyclerView.run {
-            layoutManager = GridLayoutManager(activity, 2, GridLayoutManager.VERTICAL, false)
-            adapter = searchAdapter
-            addOnScrollListener(object : RecyclerView.OnScrollListener() {
-                override fun onScrollStateChanged(rv: RecyclerView, newState: Int) {
-                    super.onScrollStateChanged(rv, newState);
-                }
-
-                override fun onScrolled(rv: RecyclerView, dx: Int, dy: Int) {
-                    //解决RecyclerView和smartRefreshLayout滑动冲突问题
-                    super.onScrolled(rv, dx, dy)
-                    val topRowVerticalPosition = if (rv.isEmpty()) 0 else rv.getChildAt(0).top
-                    binding.refreshLayout.setNestedScrollingEnabled(topRowVerticalPosition >= 0)
-                }
-            })
-        }
-        dialog = BottomSheetDialog(activity, R.style.BottomSheet).apply {
-            setContentView(binding.root)
-            setCancelable(true)
-            behavior.skipCollapsed = false // 跳过折叠状态
-//            behavior.peekHeight = 880.dp
-//            window?.setLayout(-1, 880.dp)
-            show()
-            setOnDismissListener {
-                activity.hideStatusBar()
-            }
-        }
-        binding.refreshLayout.setOnRefreshListener {
-            pageNo = 1
-            getGoodsList()
-        }
-
-        binding.refreshLayout.setOnLoadMoreListener {
-            getGoodsList()
-        }
-        binding.etSheetInput.addTextChangedListener(
-            onTextChanged = { text, start, before, count ->
-                goodsName = text.toString()
-            })
-        binding.ivSearch.setOnClickListener { v ->
-            searchGoods(v)
-        }
-        binding.root.setOnClickListener { v ->
-            KeyboardUtil.hideKeyboard(v.context, v)
-        }
-        binding.etSheetInput.let { v ->
-            v.addOnActionSearchListener {
-                searchGoods(v)
-            }
-        }
-        binding.refreshLayout.setEnableRefresh(false)
-        binding.tvClear.setOnClickListener {
-            Log.d(TAG, "show: weighAddress=$weighAddress")
-            WeightUtil.tareTwo(weighAddress)
-//            repeat(14) { num->
-//                Log.d(TAG, "show: num=$num")
-//                WeightUtil.tareTwo(num+1)
-//            }
-        }
-        WeightUtil.addWeightListener (
-            weightKey = TAG,
-            getWeight = { address, state, weight ->
-                if (weighAddress == address) {
-                    this.currentWeight = weight.toDouble()
-                    binding.tvWeight.text = getTextSpan(weight)
-                }
-            })
-        binding.tvWeight.text = getTextSpan(0.0)
-
-        if (clickName.isNullOrBlank().not()) {
-            binding.etSheetInput.setText(clickName!!.trim())
-            pageNo = 1
-            getGoodsList()
-        }
-    }
-
-    private fun searchGoods(v: View) {
-        if (goodsName.isNullOrBlank()) {
-            activity?.toast("请${binding.etSheetInput.hint}")
-            return
-        }
-        pageNo = 1
-        getGoodsList()
-        KeyboardUtil.hideKeyboard(v.context, v)
-    }
-
-    private var currentWeight = 0.toDouble()
-    private var pageNo = 1
-    private val pageSize = 120
-
-    /**
-     */
-    @SuppressLint("NotifyDataSetChanged")
-    private fun getGoodsList() {
-        val queryParams = mutableMapOf(
-            "goodsType" to "$goodsType",
-            "canteenId" to BaseApp.canteenId,
-            "pageNo" to "$pageNo",
-            "pageSize" to "$pageSize"
-        )
-        if (goodsName.isNullOrBlank().not()) {
-            queryParams.put("name", goodsName!!)
-        }
-        val sb = StringBuilder().apply {
-            append(UrlConfig.QUERY_GOODS_LIST)
-            append("?")
-            queryParams.forEach { (key, value) ->
-                append("$key=$value&")
-            }
-        }
-        sb.deleteCharAt(sb.length - 1)
-        Log.d(TAG, "getGoodsList: url = $sb")
-        HttpUtil.get(
-            url = sb.toString(),
-            doSuccess = {
-                val json = it.toJsonString()
-                Log.d(TAG, "getGoodsList: json=$json")
-                val recordBean: SeasoningRecordBean? = json.toObject<SeasoningRecordBean>()
-                if (recordBean == null || recordBean.records.isNullOrEmpty()) {
-                    activity?.toast(if (goodsType == 1) "暂未搜索到调料信息" else "暂未搜索到食材信息")
-                    return@get
-                }
-                val records = recordBean.records
-                if (pageNo == 1) {
-                    list.clear()
-                }
-                list.addAll(records!!)
-                searchAdapter.notifyDataSetChanged()
-                if (pageNo == 1) {
-                    binding.refreshLayout.finishRefresh(1200)
-                } else {
-                    binding.refreshLayout.finishLoadMore(1200)
-                }
-                val isLoadMoreEnable = records.size >= pageSize
-                binding.refreshLayout.setEnableLoadMore(isLoadMoreEnable)
-                if (isLoadMoreEnable) {
-                    pageNo++
-                }
-            }, doFailure = { code, msg ->
-                activity?.toast(msg)
-                if (pageNo == 1) {
-                    binding.refreshLayout.finishRefresh(1200)
-                } else {
-                    binding.refreshLayout.finishLoadMore(1200)
-                }
-            })
-    }
-
-    fun getTextSpan(weight: Double): SpannableStringBuilder {
-        var topWeight = "$weight"
-        var bottomUnit = "克"
-        if (weight >= 1000) {
-            topWeight = "${(weight/1000).roundedDecimalPlace(3)}"
-            bottomUnit = "千克"
-        }
-        return buildSpannableString {
-            appendText(
-                topWeight,
-                ForegroundColorSpan("#000000".toColorInt()),
-                StyleSpan(Typeface.BOLD),
-                AbsoluteSizeSpan(72, true),
-                LineHeightSpan { text, start, end, spanstartv, v, fm ->
-                    fm.descent += 10.dp // 增加行间距
-                }
-            )
-            append("\n")
-            appendText(
-                bottomUnit,
-                ForegroundColorSpan("#999999".toColorInt()),
-                AbsoluteSizeSpan(30, true)
-            )
-        }
-    }
-}
-
-
-

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

@@ -1,18 +1,19 @@
 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 android.widget.TextView
-import androidx.fragment.app.FragmentActivity
+import androidx.core.view.updateLayoutParams
+import com.shuwei.dish.match.base.DeviceRole
+import com.shuwei.dish.match.base.GlobalData
 import com.shuwei.dish.match.databinding.DialogCommonBinding
 import com.shuwei.dish.match.utils.ext.dp
-import java.lang.ref.WeakReference
+import com.shuwei.dish.match.R
 
 open class CommonDialog(
     context: Context
@@ -20,62 +21,165 @@ 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 singleText: String? = null
+    private var negativeClick: (() -> Unit)? = null
+    // 返回 true 时关闭弹窗，返回 false 时保持弹窗显示（用于校验不通过的场景）
+    private var positiveClick: (() -> Boolean)? = null
+    private var neutralClick: (() -> Unit)? = null
+    private var singleClick: (() -> Unit)? = null
+    private var dismissCallback: (() -> Unit)? = null
+    // 待添加到 llContent 的自定义 View，在 onCreate 后挂载
+    private var pendingContentView: View? = null
+    // pendingContentView 非空时对 tvContent 的灵活控制回调（可调整可见性、间距等）
+    private var tvContentConfigurator: ((TextView) -> 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?.let { cb -> { cb(); true } }
+    }
+
+    /**
+     * 设置右侧确认按钮文字及可拦截的点击回调
+     * 回调返回 true 时关闭弹窗，返回 false 时保持弹窗显示（用于校验不通过的场景）
+     */
+    fun setPositiveButtonInterceptable(text: String, onClick: () -> Boolean): CommonDialog = apply {
+        positiveText = text
+        positiveClick = onClick
+    }
+
+    /** 设置中间第三个按钮文字及点击回调，调用后自动切换为垂直3按钮布局 */
+    fun setNeutralButton(text: String, onClick: (() -> Unit)? = null): CommonDialog = apply {
+        neutralText = text
+        neutralClick = onClick
+    }
+
+    /** 设置单按钮文字及点击回调，调用后自动切换为单按钮布局（优先级最高） */
+    fun setSingleButton(text: String, onClick: (() -> Unit)? = null): CommonDialog = apply {
+        singleText = text
+        singleClick = onClick
+    }
+
+    /** 设置弹窗消失回调 */
+    fun setOnDismissCallback(callback: () -> Unit): CommonDialog = apply {
+        dismissCallback = callback
+    }
+
+    /**
+     * 向弹窗自定义内容区域添加 View，调用后 llContent 自动显示
+     * @param view 要嵌入的自定义布局（如单选列表）
+     * @param tvContentConfig 可选回调，用于在 pendingContentView 非空时灵活控制 tvContent 的可见性及间距等属性
+     */
+    fun addContentView(view: View, tvContentConfig: ((TextView) -> Unit)? = null): CommonDialog = apply {
+        pendingContentView = view
+        tvContentConfigurator = tvContentConfig
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         requestWindowFeature(Window.FEATURE_NO_TITLE)
         binding = DialogCommonBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        window?.run {
+        // 弹窗不允许点击外部关闭
-//            decorView.setPadding(0.dp, 0, 0.dp, 0)
-            attributes = attributes.apply {
-                width = 708.dp
-            }
-            setBackgroundDrawable(ColorDrawable())
         setCancelable(false)
-//            setFlags(
+        val isMaster = GlobalData.deviceRole == DeviceRole.MASTER
-//                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
+        window?.run {
-//                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+            val screenWidth = context.resources.displayMetrics.widthPixels
-//            )
+            attributes = attributes.apply {
+                width = if (isMaster) (screenWidth * 0.72f).toInt() else (screenWidth * 0.60f).toInt()
+            }
+            // 透明背景，让 shape_dialog_bg 的阴影层正常显示
+            setBackgroundDrawable(ColorDrawable())
+            // 应用缩放+淡入淡出动画
+            setWindowAnimations(R.style.CommonDialogAnimation)
+        }
+        // 主/从设备边距微调：主设备内容区域更大，适当增加上下留白
+        val verticalMargin = if (isMaster) 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 {
+            // 回调返回 false 时阻止关闭，null 或 true 时正常关闭
+            if (positiveClick?.invoke() != false) dismiss()
         }
 
-        binding.llContent.run {
+        // 3按钮点击事件（negativeClick/positiveClick 与2按钮模式共用）
-            removeAllViews()
+        binding.btnTop.setOnClickListener {
-            addView(messageView)
+            negativeClick?.invoke()
+            dismiss()
         }
-        addListener()
+        binding.btnMiddle.setOnClickListener {
+            neutralClick?.invoke()
+            dismiss()
+        }
+        binding.btnBottom.setOnClickListener {
+            if (positiveClick?.invoke() != false) dismiss()
         }
 
-    private fun addListener() {
+        // 单按钮点击事件
-        binding.btnLeft.setOnClickListener { onLeftClick?.invoke() }
+        binding.btnSingle.setOnClickListener {
-        binding.btnRight.setOnClickListener { onRightClick?.invoke() }
+            singleClick?.invoke()
-        setOnDismissListener { onDismiss?.invoke() }
+            dismiss()
         }
 
+        setOnDismissListener { dismissCallback?.invoke() }
+
+        // 挂载自定义内容 View，并执行 tvContent 的灵活控制回调
+        pendingContentView?.let {
+            binding.llContent.removeAllViews()
+            binding.llContent.addView(it)
+            binding.llContent.visibility = View.VISIBLE
+            tvContentConfigurator?.invoke(binding.tvContent)
+        }
+    }
 
     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
+        val hasSingleButton = !singleText.isNullOrEmpty()
-    var onRightClick: (() -> Unit)? = null
+        binding.btnSingle.visibility = if (hasSingleButton) View.VISIBLE else View.GONE
+        binding.layoutButtonsHorizontal.visibility = if (!hasSingleButton && !hasThreeButtons) View.VISIBLE else View.GONE
+        binding.layoutButtonsVertical.visibility = if (hasThreeButtons) View.VISIBLE else View.GONE
 
-    var leftText = ""
+        if (hasSingleButton) {
-    var rightText = ""
+            // 单按钮模式
-
+            binding.btnSingle.text = singleText
-    var onDismiss: (() -> Unit)? = null
+        } else if (hasThreeButtons) {
-
+            // 3按钮模式：顶部=取消，中间=中立，底部=确认
-}
+            binding.btnTop.text = negativeText
-
+            binding.btnMiddle.text = neutralText
-open class SafeDialog(activity: Activity, @StyleRes themeResId: Int) :
+            binding.btnBottom.text = positiveText
-    Dialog(activity, themeResId) {
+        } else {
-    private val weakContext = WeakReference(activity)
+            // 2按钮模式
-
+            binding.btnLeft.text = negativeText
-    override fun show() {
+            binding.btnRight.text = positiveText
-        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/EnvSwitchDialog.kt

@@ -0,0 +1,68 @@
+package com.shuwei.dish.match.dialog
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import com.shuwei.dish.match.base.GlobalData
+import com.shuwei.dish.match.databinding.DialogEnvSwitchContentBinding
+import com.shuwei.dish.match.utils.SpTool
+import com.shuwei.dish.match.utils.ext.toast
+
+/**
+ * 环境切换弹窗
+ *
+ * 基于 [CommonDialog] 实现，通过 addContentView 注入 RadioGroup 内容区。
+ * 提供 TEST / UAT / PROD 三套环境的切换功能，初始化时自动根据
+ * [GlobalData.appBaseUrl] 选中当前环境，确认后更新 [GlobalData.appBaseUrl]
+ * 并通过 [onEnvChanged] 回调通知外部。
+ *
+ * @param context      上下文
+ * @param onEnvChanged 确认切换后的回调，参数为新的 baseUrl
+ */
+class EnvSwitchDialog(
+    context: Context,
+    private val onEnvChanged: (newBaseUrl: String) -> Unit = {}
+) {
+
+    private val contentBinding = DialogEnvSwitchContentBinding.inflate(LayoutInflater.from(context))
+
+    private val dialog = CommonDialog(context)
+        .setTitle("切换环境")
+        .addContentView(contentBinding.root) { tvContent ->
+            // 内容区已由 RadioGroup 承载，隐藏默认文本
+            tvContent.visibility = View.GONE
+        }
+        .setNegativeButton("取消")
+        .setPositiveButtonInterceptable("确认") {
+            // 未选中任何选项时提示并阻止关闭
+            if (contentBinding.rgEnv.checkedRadioButtonId == -1) {
+                context.toast("请选择环境")
+                return@setPositiveButtonInterceptable false
+            }
+            val newUrl = when (contentBinding.rgEnv.checkedRadioButtonId) {
+                contentBinding.rbTest.id -> GlobalData.TEST_BASE_URL
+                contentBinding.rbUat.id  -> GlobalData.UAT_BASE_URL
+                contentBinding.rbProd.id -> GlobalData.PROD_BASE_URL
+                else                     -> return@setPositiveButtonInterceptable false
+            }
+            GlobalData.appBaseUrl = newUrl
+            SpTool.baseUrl = newUrl
+            onEnvChanged(newUrl)
+            true
+        }
+
+    init {
+        // 根据当前 appBaseUrl 预选对应 RadioButton
+        when (GlobalData.appBaseUrl) {
+            GlobalData.TEST_BASE_URL -> contentBinding.rbTest.isChecked = true
+            GlobalData.UAT_BASE_URL  -> contentBinding.rbUat.isChecked  = true
+            GlobalData.PROD_BASE_URL -> contentBinding.rbProd.isChecked = true
+        }
+    }
+
+    /** 显示弹窗 */
+    fun show() = dialog.show()
+
+    /** 关闭弹窗 */
+    fun dismiss() = dialog.dismiss()
+}

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

@@ -0,0 +1,291 @@
+package com.shuwei.dish.match.dialog
+
+import android.annotation.SuppressLint
+import android.graphics.Rect
+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.widget.addTextChangedListener
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.chad.library.adapter4.util.setOnDebouncedItemClick
+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.DialogFoodSearchBinding
+import com.shuwei.dish.match.databinding.LayoutEmptyViewBinding
+import com.shuwei.dish.match.model.GoodsItem
+import com.shuwei.dish.match.model.MaterSearchItem
+import com.shuwei.dish.match.net.UiState
+import com.shuwei.dish.match.utils.KeyboardUtil
+import com.shuwei.dish.match.utils.showRawMaterialsDialog
+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 val activity: BaseActivity,
+    private val defGoodsName: String? = null,
+    private val onItemSelected: (item: GoodsItem) -> Unit
+) : BottomSheetDialog(activity, R.style.BottomSheet) {
+
+    companion object {
+        const val PAGE_SIZE = 50
+    }
+
+    private val binding = DialogFoodSearchBinding.inflate(LayoutInflater.from(activity))
+    private val list = mutableListOf<GoodsItem>()
+
+    private val adapter = FoodAdapter(list).apply {
+        isStateViewEnable = true
+        setOnDebouncedItemClick { _, _, position ->
+            val item = list.getOrNull(position) ?: return@setOnDebouncedItemClick
+            item.isClicked = true
+            notifyItemChanged(position)
+            // mater-search 不返回净材种类，rawMaterialsTypes 为空时直接选中返回，避免卡在净材弹窗
+            if (item.rawMaterialsTypes.isNullOrBlank()) {
+                binding.root.postDelayed({
+                    onItemSelected(item)
+                    dismiss()
+                }, 300)
+                return@setOnDebouncedItemClick
+            }
+            // 有净材种类时弹出单选弹窗，确认后再回调并关闭弹窗
+            showRawMaterialsDialog(
+                context = activity,
+                types = item.rawMaterialsTypes,
+                checkedType = item.rawMaterialsType
+            ) { selectedType ->
+                item.rawMaterialsType = selectedType
+                binding.root.postDelayed({
+                    onItemSelected(item)
+                    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(
+                onTextChanged = { text, _, _, _ -> goodsName = text.toString() },
+                afterTextChanged = { it: Editable? ->
+                    if (it.isNullOrBlank()) {
+                        list.clear()
+                        adapter.notifyDataSetChanged()
+                    }
+                }
+            )
+            addOnActionSearchListener { searchGoods(this) }
+        }
+
+        // RecyclerView 初始化
+        binding.recyclerView.run {
+            layoutManager = GridLayoutManager(activity, 2, GridLayoutManager.VERTICAL, false)
+            adapter = this@FoodSearchDialog.adapter
+//            addOnScrollListener(object : RecyclerView.OnScrollListener() {
+//                override fun onScrolled(rv: RecyclerView, dx: Int, dy: Int) {
+//                    super.onScrolled(rv, dx, dy)
+//                    // 解决 RecyclerView 与 SmartRefreshLayout 滑动冲突
+//                    val topRowVerticalPosition = if (rv.isEmpty()) 0 else rv.getChildAt(0).top
+//                    binding.refreshLayout.setNestedScrollingEnabled(topRowVerticalPosition >= 0)
+//                }
+//            })
+        }
+
+        binding.refreshLayout.run {
+            setEnableRefresh(true)
+            setEnableLoadMore(false)
+            setOnRefreshListener { pageNo = 1; getGoodsList() }
+            setOnLoadMoreListener { getGoodsList() }
+        }
+
+        binding.ivSearch.setOnClickListener { searchGoods(it) }
+        binding.root.setOnClickListener { KeyboardUtil.hideKeyboard(it) }
+
+        // 若有默认食材名称，自动填充并触发搜索
+        //if (!defGoodsName.isNullOrBlank()) {
+            //binding.etSheetInput.setText(defGoodsName)
+            pageNo = 1
+            getGoodsList()
+            KeyboardUtil.hideKeyboard(binding.root)
+        //}
+    }
+
+    /** 弹窗显示时在 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)
+            }
+
+            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)
+    }
+
+    /**
+     * 请求食材列表（采样模式新配比秤接口 mater-search，回调版本）
+     */
+    private fun getGoodsList() {
+        activity.netViewModel.materSearch(
+            keyword = goodsName.takeUnless { it.isNullOrBlank() },
+            pageNum = pageNo,
+            pageSize = PAGE_SIZE,
+            onResult = { state ->
+                when (state) {
+                    is UiState.Success -> loadGoodsList(state.data)
+                    is UiState.Error -> {
+                        activity.toast(state.msg)
+                        finishRefresh()
+                        if (pageNo == 1) loadEmptyView()
+                    }
+                    else -> {}
+                }
+            }
+        )
+    }
+
+    /**
+     * 将返回数据填充到列表
+     */
+    @SuppressLint("NotifyDataSetChanged")
+    private fun loadGoodsList(records: List<MaterSearchItem>?) {
+        finishRefresh()
+        if (records.isNullOrEmpty()) {
+            if (pageNo == 1) {
+                loadEmptyView()
+            }
+            return
+        }
+        // 仅当当前不是 GridLayoutManager 时才重新赋值（空态切回网格时）
+        binding.recyclerView.run {
+            if (layoutManager !is GridLayoutManager) {
+                layoutManager = GridLayoutManager(activity, 2, GridLayoutManager.VERTICAL, false)
+            }
+        }
+        if (pageNo == 1) list.clear()
+        // mater-search 不返回净材种类，rawMaterialsTypes 保持 null，点击时直接选中返回
+        val goodsItems = records.map { it.toGoodsItem() }
+        list.addAll(goodsItems)
+        adapter.notifyDataSetChanged()
+        val isLoadMoreEnable = records.size >= PAGE_SIZE
+        binding.refreshLayout.setEnableLoadMore(isLoadMoreEnable)
+        if (isLoadMoreEnable) pageNo++
+    }
+
+    /**
+     * MaterSearchItem → GoodsItem 映射
+     * id 即食材id，同时作为 goodsId 和 materId（提交 sample/save 时使用）
+     */
+    private fun MaterSearchItem.toGoodsItem() = GoodsItem(
+        goodsId = id,
+        materId = id,
+        goodsName = materName,
+        materCode = materCode,
+        popularName = alias
+    )
+
+    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?.let {
+                it.tvContent.text = "暂无数据"
+                it.tvSubContent.text = "未查询到食材信息，请联系管理员添加"
+//                it.root.setOnClickListener { loadGoodsList(buildMockGoodsList().toMutableList()) }
+                it.root.layoutParams = FrameLayout.LayoutParams(
+                    FrameLayout.LayoutParams.MATCH_PARENT,
+                    FrameLayout.LayoutParams.MATCH_PARENT
+                )
+                binding.recyclerView.layoutManager = LinearLayoutManager(activity)
+                binding.recyclerView.post {
+                    it.root.minimumHeight = binding.recyclerView.height
+                    adapter.stateView = it.root
+                }
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+}

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

@@ -0,0 +1,80 @@
+package com.shuwei.dish.match.dialog
+
+import android.graphics.Rect
+import android.view.KeyboardShortcutGroup
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MotionEvent
+import android.view.ViewGroup
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.shuwei.dish.match.R
+import com.shuwei.dish.match.adapter.GoodsPreviewAdapter
+import com.shuwei.dish.match.databinding.DialogGoodsPreviewBinding
+import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
+import com.shuwei.dish.match.utils.ext.gone
+import com.shuwei.dish.match.utils.ext.visible
+
+/**
+ * 用料明细预览弹窗，以 BottomSheetDialog 形式展示当前 goodsList
+ * @param context 宿主 Context（Activity）
+ * @param goodsList 需要展示的物品列表
+ */
+class GoodsPreviewDialog(
+    context: android.content.Context,
+    private val goodsList: List<CookFoodGoodsEntity>
+) : BottomSheetDialog(context, R.style.BottomSheet) {
+
+    private val binding = DialogGoodsPreviewBinding.inflate(LayoutInflater.from(context))
+
+    init {
+        setContentView(binding.root)
+        setCancelable(true)
+        window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+
+        binding.rvGoodsList.run {
+            layoutManager = LinearLayoutManager(context)
+            adapter = GoodsPreviewAdapter(goodsList)
+        }
+        // foodId 对同一菜品所有条目相同，统一显示在列表上方
+        val foodId = goodsList.firstOrNull()?.foodId.orEmpty()
+        binding.tvFoodId.text = "菜品ID：${foodId.ifEmpty { "-" }}"
+        if (goodsList.isEmpty()) {
+            binding.rvGoodsList.gone()
+            binding.tvEmpty.visible()
+        }
+    }
+
+    /** 弹出时注入 Window.Callback，解决 RecyclerView 与 BottomSheet 拖拽的滑动冲突 */
+    override fun show() {
+        super.show()
+        val originalCallback = window?.callback ?: return
+        window?.callback = object : android.view.Window.Callback by originalCallback {
+            override fun dispatchTouchEvent(event: MotionEvent): Boolean {
+                when (event.actionMasked) {
+                    MotionEvent.ACTION_DOWN -> {
+                        val rect = Rect()
+                        binding.rvGoodsList.getGlobalVisibleRect(rect)
+                        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)
+            }
+        }
+    }
+}

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

@@ -1,43 +1,103 @@
 package com.shuwei.dish.match.dialog
 
+import android.annotation.SuppressLint
 import android.app.Dialog
 import android.content.Context
 import android.graphics.Color
+import android.os.Handler
+import android.os.Looper
 import android.view.LayoutInflater
 import android.view.WindowManager
 import androidx.core.graphics.drawable.toDrawable
 import com.shuwei.dish.match.R
 import com.shuwei.dish.match.databinding.DialogLoadingBinding
 
+@SuppressLint("StaticFieldLeak")
 object Loading {
 
+    /** 默认超时兜底时长（毫秒）：业务方未传值时使用 */
+    const val DEFAULT_TIMEOUT_MS = 15_000L
+
     private var dialog: LoadingDialog? = null
+    /** 当前持有 Loading 的 context，用于隔离 Activity 销毁时的误关 */
+    private var owner: Context? = null
+    private val timeoutHandler = Handler(Looper.getMainLooper())
+    private val timeoutRunnable = Runnable { dismiss() }
 
-    fun show(context: Context) {
+    fun isShowing(): Boolean {
+        return dialog != null && dialog!!.isShowing
+    }
+
+    fun updateContent(content: String) {
+        if (isShowing().not()) return
+        dialog!!.updateContent(content)
+    }
+
+    /**
+     * 显示 Loading 弹窗
+     *
+     * @param context   上下文
+     * @param message   提示文案
+     * @param timeoutMs 超时兜底时长（毫秒）：到期自动 dismiss；传 0 关闭兜底，由业务方自己负责
+     * @param onDismiss 关闭回调
+     */
+    fun show(
+        context: Context,
+        message: String = "加载中……",
+        timeoutMs: Long = DEFAULT_TIMEOUT_MS,
+        onDismiss: () -> Unit = {}
+    ) {
         try {
+            // 节流：已显示中只更新文案 + 重置超时，不重新 attach 窗口
+            // 避免反复触发 FocusEvent 在主线程繁忙时引发 ANR
             if (dialog?.isShowing == true) {
-                dialog?.dismiss()
+                dialog?.updateContent(message)
-            }
+                owner = context  // 同一弹窗最后一次 show 决定 owner
-
+                resetTimeout(timeoutMs)
-            if (dialog == null) {
+                return
-                dialog = LoadingDialog(context)
             }
+            dialog = LoadingDialog(context = context, message = message, onDismiss = onDismiss)
+            owner = context
             dialog?.show()
+            resetTimeout(timeoutMs)
         } catch (e: Exception) {
             e.printStackTrace()
         }
     }
 
     fun dismiss() {
+        timeoutHandler.removeCallbacks(timeoutRunnable)
         try {
             dialog?.let {
                 if (it.isShowing) {
                     it.dismiss()
                 }
             }
-            dialog = null
         } catch (e: Exception) {
             e.printStackTrace()
+        } finally {
+            dialog = null
+            owner = null
+        }
+    }
+
+    /**
+     * Activity 销毁专用：只关闭自己持有的 Loading，防止跨 Activity 误关
+     * 单例 Loading 在多 Activity 共享时，若每个 Activity 的 onDestroy 都无脑 dismiss，
+     * 会误关后启动 Activity 弹出的 Loading；由本方法做 owner 校验后才允许关闭
+     */
+    fun dismissIfOwnedBy(context: Context) {
+        if (owner === context) dismiss()
+    }
+
+    /**
+     * 重置超时兜底定时器
+     * @param timeoutMs <=0 表示不安排定时器（关闭兜底）
+     */
+    private fun resetTimeout(timeoutMs: Long) {
+        timeoutHandler.removeCallbacks(timeoutRunnable)
+        if (timeoutMs > 0) {
+            timeoutHandler.postDelayed(timeoutRunnable, timeoutMs)
         }
     }
 
@@ -45,25 +105,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

@@ -0,0 +1,259 @@
+//package com.shuwei.dish.match.dialog
+//
+//import android.annotation.SuppressLint
+//import android.graphics.Typeface
+//import android.os.Handler
+//import android.os.Looper
+//import android.text.SpannableStringBuilder
+//import android.text.style.AbsoluteSizeSpan
+//import android.text.style.ForegroundColorSpan
+//import android.text.style.LineHeightSpan
+//import android.text.style.StyleSpan
+//import android.util.Log
+//import android.view.Gravity
+//import android.view.LayoutInflater
+//import android.view.View
+//import android.view.ViewGroup
+//import android.view.WindowManager
+//import androidx.core.graphics.toColorInt
+//import androidx.core.view.isEmpty
+//import androidx.core.widget.addTextChangedListener
+//import androidx.lifecycle.Lifecycle
+//import androidx.lifecycle.lifecycleScope
+//import androidx.lifecycle.repeatOnLifecycle
+//import androidx.recyclerview.widget.GridLayoutManager
+//import androidx.recyclerview.widget.RecyclerView
+//import com.google.android.material.bottomsheet.BottomSheetDialog
+//import com.shuwei.dish.match.R
+//import com.shuwei.dish.match.adapter.SeasoningSearchAdapter
+//import com.shuwei.dish.match.base.BaseActivity
+//import com.shuwei.dish.match.base.BaseApp
+//import com.shuwei.dish.match.databinding.DialogSeasoningSearchBinding
+//import com.shuwei.dish.match.entity.SeasoningEntity
+//import com.shuwei.dish.match.net.UiState
+//import com.shuwei.dish.match.utils.KeyboardUtil
+//import com.shuwei.dish.match.utils.WeightUtil
+//import com.shuwei.dish.match.utils.ext.addOnActionSearchListener
+//import com.shuwei.dish.match.utils.ext.appendText
+//import com.shuwei.dish.match.utils.ext.buildSpannableString
+//import com.shuwei.dish.match.utils.ext.dp
+//import com.shuwei.dish.match.utils.ext.roundedDecimalPlace
+//import com.shuwei.dish.match.utils.ext.toast
+//import kotlinx.coroutines.launch
+//
+///**
+// * 调料搜索弹窗，继承 BottomSheetDialog 确保只初始化一次
+// * @param activity 宿主 Activity
+// * @param weighIndex 秤的索引
+// * @param weighAddress 秤的地址，用于监听重量和去皮
+// * @param clickName 默认填充的调料名称（可选）
+// * @param onItemSelected 用户点击某一调料时的回调，携带当前重量
+// */
+//class SeasoningSearchDialog(
+//    private val activity: BaseActivity,
+//    private val weighIndex: Int,
+//    private val weighAddress: Int,
+//    private val clickName: String? = null,
+//    private val onItemSelected: (item: SeasoningEntity) -> Unit
+//) : BottomSheetDialog(activity, R.style.BottomSheet) {
+//
+//    companion object {
+//        const val TAG = "BottomDialog2"
+//    }
+//
+//    private val binding = DialogSeasoningSearchBinding.inflate(LayoutInflater.from(activity))
+//    private val list = mutableListOf<SeasoningEntity>()
+//    private val adapter = SeasoningSearchAdapter(list).apply {
+//        setOnItemClickListener { _, _, position ->
+//            list[position].isClicked = true
+//            notifyItemChanged(position)
+//            Handler(Looper.getMainLooper()).postDelayed({
+//                onItemSelected(list[position].also { it.useWeight = currentWeight })
+//                dismiss()
+//            }, 300)
+//        }
+//    }
+//
+//    private var goodsName: String? = null
+//    private var currentWeight = 0.0
+//    private var pageNo = 1
+//    private val pageSize = 50
+//
+//    init {
+//        setContentView(binding.root)
+//        setCancelable(true)
+//        behavior.skipCollapsed = false
+//        window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
+//        window?.setGravity(Gravity.BOTTOM)
+//        window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+//        window?.setWindowAnimations(R.style.DialogSoftInputAnimation)
+//        window?.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
+//
+//        setOnDismissListener {
+//            // 弹窗关闭时移除重量监听，避免内存泄漏
+//            WeightUtil.removeWeightListener(TAG)
+//            activity.hideStatusBar()
+//        }
+//
+//        // 输入框：清空时重置列表
+//        binding.etSheetInput.run {
+//            hint = "输入调料名称"
+//            addTextChangedListener(
+//                onTextChanged = { text, _, _, _ -> goodsName = text.toString() },
+//                afterTextChanged = {
+//                    if (it.isNullOrBlank()) {
+//                        list.clear()
+//                        adapter.notifyDataSetChanged()
+//                    }
+//                }
+//            )
+//            addOnActionSearchListener { searchGoods(this) }
+//        }
+//
+//        // RecyclerView 初始化及滑动冲突处理
+//        binding.recyclerView.let {
+//            it.layoutManager = GridLayoutManager(activity, 2, GridLayoutManager.VERTICAL, false)
+//            it.adapter = adapter
+//            it.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+//                override fun onScrolled(rv: RecyclerView, dx: Int, dy: Int) {
+//                    super.onScrolled(rv, dx, dy)
+//                    // 解决 RecyclerView 与 SmartRefreshLayout 滑动冲突
+//                    val topRowVerticalPosition = if (rv.isEmpty()) 0 else rv.getChildAt(0).top
+//                    binding.refreshLayout.setNestedScrollingEnabled(topRowVerticalPosition >= 0)
+//                }
+//            })
+//        }
+//
+//        binding.refreshLayout.run {
+//            setEnableRefresh(false)
+//            setEnableLoadMore(false)
+//            setOnRefreshListener { pageNo = 1; getGoodsList() }
+//            setOnLoadMoreListener { getGoodsList() }
+//        }
+//
+//        binding.ivSearch.setOnClickListener { searchGoods(it) }
+//        binding.root.setOnClickListener { KeyboardUtil.hideKeyboard(it) }
+//
+//        // 去皮按钮
+//        binding.tvClear.setOnClickListener {
+//            Log.d(TAG, "tareTwo: weighAddress=$weighAddress")
+//            WeightUtil.tareTwo(weighAddress)
+//        }
+//
+//        // 监听对应秤的重量变化
+//        WeightUtil.addWeightListener(
+//            weightKey = TAG,
+//            getWeight = { address, _, weight ->
+//                if (weighAddress == address) {
+//                    currentWeight = weight.toDouble()
+//                    binding.tvWeight.text = getTextSpan(weight)
+//                }
+//            }
+//        )
+//        binding.tvWeight.text = getTextSpan(0.0)
+//
+//        initObserver()
+//
+//        // 若有默认调料名称，自动填充并触发搜索
+//        if (!clickName.isNullOrBlank()) {
+//            binding.etSheetInput.setText(clickName.trim())
+//            pageNo = 1
+//            getGoodsList()
+//        }
+//    }
+//
+//    /**
+//     * 收集 seasoningListState，统一处理 Loading / Success / Error 状态
+//     */
+//    private fun initObserver() {
+//        activity.lifecycleScope.launch {
+//            activity.repeatOnLifecycle(Lifecycle.State.STARTED) {
+//                activity.netViewModel.seasoningListState.collect { state ->
+//                    when (state) {
+//                        is UiState.Success -> loadGoodsList(state.data)
+//                        is UiState.Error -> {
+//                            activity.toast(state.msg)
+//                            finishRefresh()
+//                        }
+//                        else -> {}
+//                    }
+//                }
+//            }
+//        }
+//    }
+//
+//    /**
+//     * 触发搜索：校验输入、隐藏键盘、发起请求
+//     */
+//    private fun searchGoods(v: View) {
+//        if (goodsName.isNullOrBlank()) {
+//            activity.toast("请${binding.etSheetInput.hint}")
+//            return
+//        }
+//        pageNo = 1
+//        getGoodsList()
+//        KeyboardUtil.hideKeyboard(v)
+//    }
+//
+//    /**
+//     * 请求调料列表
+//     */
+//    private fun getGoodsList() {
+//        val param = mutableMapOf<String, Any>(
+//            "goodsType" to "1",
+//            "placeId" to BaseApp.canteenId,
+//            "pageNum" to pageNo,
+//            "pageSize" to pageSize
+//        )
+//        if (!goodsName.isNullOrBlank()) {
+//            param["goodsName"] = goodsName!!
+//        }
+//        activity.netViewModel.querySeasoningList(param)
+//    }
+//
+//    /**
+//     * 将返回数据填充到列表
+//     */
+//    @SuppressLint("NotifyDataSetChanged")
+//    private fun loadGoodsList(records: MutableList<SeasoningEntity>?) {
+//        finishRefresh()
+//        if (records.isNullOrEmpty()) {
+//            activity.toast("暂未搜索到调料信息")
+//            return
+//        }
+//        if (pageNo == 1) list.clear()
+//        list.addAll(records)
+//        adapter.notifyDataSetChanged()
+//        val isLoadMoreEnable = records.size >= pageSize
+//        binding.refreshLayout.setEnableLoadMore(isLoadMoreEnable)
+//        if (isLoadMoreEnable) pageNo++
+//    }
+//
+//    private fun finishRefresh() {
+//        if (pageNo == 1) binding.refreshLayout.finishRefresh()
+//        else binding.refreshLayout.finishLoadMore()
+//    }
+//
+//    /**
+//     * 生成重量显示的富文本：数值大字加粗，单位小字灰色
+//     */
+//    fun getTextSpan(weight: Double): SpannableStringBuilder {
+//        val topWeight = if (weight >= 1000) "${(weight / 1000).roundedDecimalPlace(3)}" else "$weight"
+//        val bottomUnit = if (weight >= 1000) "千克" else "克"
+//        return buildSpannableString {
+//            appendText(
+//                topWeight,
+//                ForegroundColorSpan("#000000".toColorInt()),
+//                StyleSpan(Typeface.BOLD),
+//                AbsoluteSizeSpan(72, true),
+//                LineHeightSpan { _, _, _, _, _, fm -> fm.descent += 10.dp }
+//            )
+//            append("\n")
+//            appendText(
+//                bottomUnit,
+//                ForegroundColorSpan("#999999".toColorInt()),
+//                AbsoluteSizeSpan(30, true)
+//            )
+//        }
+//    }
+//}

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

@@ -0,0 +1,278 @@
+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.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.model.GoodsItem
+import com.shuwei.dish.match.model.SeasoningSearchItem
+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
+/**
+ * 调料选择弹窗，不含重量显示，继承 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 ->
+            val item = list.getOrNull(position) ?: return@setOnItemClickListener
+            item.isClicked = true
+            notifyItemChanged(position)
+            v.postDelayed({
+                onItemSelected(item)
+                dismiss()
+            }, 300)
+        }
+    }
+
+    private var goodsName: String? = null
+    private var pageNo = 1
+
+    init {
+        setContentView(binding.root)
+        setCancelable(true)
+        behavior.skipCollapsed = false
+        window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
+        window?.setGravity(Gravity.BOTTOM)
+        window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        window?.setWindowAnimations(R.style.DialogSoftInputAnimation)
+        window?.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
+
+        setOnDismissListener {
+            activity.hideStatusBar()
+        }
+
+        // 输入框：清空时重置列表
+        binding.etSheetInput.run {
+            hint = "输入调料名称"
+            addTextChangedListener(
+                onTextChanged = { text, _, _, _ -> goodsName = text.toString() },
+                afterTextChanged = {
+                    if (it.isNullOrBlank()) {
+                        list.clear()
+                        adapter.notifyDataSetChanged()
+                    }
+                }
+            )
+            addOnActionSearchListener { searchGoods(this) }
+        }
+
+        // RecyclerView 初始化
+        binding.recyclerView.run {
+            layoutManager = GridLayoutManager(activity, 3, GridLayoutManager.VERTICAL, false)
+            adapter = this@SeasoningSelectDialog.adapter
+        }
+
+        binding.refreshLayout.run {
+            setEnableRefresh(true)
+            setEnableLoadMore(false)
+            setOnRefreshListener { pageNo = 1; getGoodsList() }
+            setOnLoadMoreListener { getGoodsList() }
+        }
+
+        binding.ivSearch.setOnClickListener { searchGoods(it) }
+        binding.root.setOnClickListener { KeyboardUtil.hideKeyboard(it) }
+    }
+
+    /** 弹窗显示时自动加载默认调料列表，并在 Window.Callback 层提前拦截触摸以解决滑动冲突 */
+    override fun show() {
+        super.show()
+        pageNo = 1
+        getGoodsList()
+        // Window.Callback.dispatchTouchEvent 在整个 View 树的 onInterceptTouchEvent 之前执行，
+        // 是最早能感知触摸的时机。在此处判断触摸点位置来控制 behavior.isDraggable，
+        // 从而确保 BottomSheetBehavior 在 CoordinatorLayout.onInterceptTouchEvent 时
+        // 已经是禁用状态，不会拦截列表区域的滑动手势。
+        val originalCallback = window?.callback ?: return
+        window?.callback = object : Window.Callback by originalCallback {
+            override fun dispatchTouchEvent(event: MotionEvent): Boolean {
+                when (event.actionMasked) {
+                    MotionEvent.ACTION_DOWN -> {
+                        val rect = Rect()
+                        binding.refreshLayout.getGlobalVisibleRect(rect)
+                        // 触摸点落在列表区域内则禁止 BottomSheet 拖拽
+                        behavior.isDraggable = !rect.contains(event.rawX.toInt(), event.rawY.toInt())
+                    }
+                    MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
+                        behavior.isDraggable = true
+                    }
+                }
+                return originalCallback.dispatchTouchEvent(event)
+            }
+
+            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.querySeasoningSearch(
+            keyword = goodsName.takeUnless { it.isNullOrBlank() },
+            pageNum = pageNo,
+            pageSize = PAGE_SIZE,
+            onResult = { state ->
+                when (state) {
+                    is UiState.Success -> loadGoodsList(state.data)
+                    is UiState.Error -> {
+                        activity.toast(state.msg)
+                        finishRefresh()
+                        if (pageNo == 1) loadEmptyView()
+                    }
+                    else -> {}
+                }
+            }
+        )
+    }
+
+    /**
+     * 加载本地模拟数据，仅用于联调时点击空布局快速验证 UI
+     */
+    private fun loadMockData() {
+        val nameList = listOf(
+            "盐", "白砂糖", "冰糖", "鸡精", "味精", "陈醋", "老抽", "生抽", "番茄酱", "胡椒粉", "孜然", "十三香",
+            "料酒", "白醋", "蚝油", "辣椒面", "辣椒酱", "豆瓣酱", "淀粉", "葱", "蒜", "姜", "香菜", "油"
+        )
+        val mockData = nameList.mapIndexed { index, name ->
+            val padString = "${index + 1}".padStart(2, '0')
+            SeasoningSearchItem(id = "1000$padString", materName = name)
+        }
+        pageNo = 1
+        loadGoodsList(mockData)
+    }
+
+    /**
+     * 将新接口返回的 SeasoningSearchItem 映射为 GoodsItem 并填充到列表
+     * 新接口的 id 即食材id，同时用作 goodsId 和 materId，无需再交换
+     */
+    @SuppressLint("NotifyDataSetChanged")
+    private fun loadGoodsList(records: List<SeasoningSearchItem>?) {
+        finishRefresh()
+        if (records.isNullOrEmpty()) {
+            if (pageNo == 1) {
+                loadEmptyView()
+            }
+            return
+        }
+        binding.recyclerView.layoutManager = GridLayoutManager(activity, 3, GridLayoutManager.VERTICAL, false)
+        if (pageNo == 1) list.clear()
+        val goodsItems = records.map { it.toGoodsItem() }
+        list.addAll(goodsItems)
+        adapter.notifyDataSetChanged()
+        val isLoadMoreEnable = records.size >= PAGE_SIZE
+        binding.refreshLayout.setEnableLoadMore(isLoadMoreEnable)
+        if (isLoadMoreEnable) pageNo++
+    }
+
+    /**
+     * SeasoningSearchItem → GoodsItem 映射
+     * id 既是食材id也是提交时的 goodsId，不需要 oldGoodsId 交换
+     */
+    private fun SeasoningSearchItem.toGoodsItem() = GoodsItem(
+        goodsId = id,
+        materId = id,
+        goodsName = materName,
+        materCode = materCode,
+        popularName = alias
+    )
+
+    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?.let {
+                it.tvContent.text = "暂无数据"
+                it.tvSubContent.text = "未查询到调料信息，请联系管理员添加"
+                // 点击空布局加载本地模拟数据，方便联调时验证 UI
+                //it.root.setOnClickListener { loadMockData() }
+                it.root.layoutParams = FrameLayout.LayoutParams(
+                    FrameLayout.LayoutParams.MATCH_PARENT,
+                    FrameLayout.LayoutParams.MATCH_PARENT
+                )
+                binding.recyclerView.layoutManager = LinearLayoutManager(activity)
+                binding.recyclerView.post {
+                    it.root.minimumHeight = binding.recyclerView.height
+                    adapter.stateView = it.root
+                }
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+}

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

@@ -1,62 +0,0 @@
-package com.shuwei.dish.match.entity
-
-data class HomeModeBean(
-
-    var modeName: String = "",
-    var modeDesc: String = "",
-    var modeIconId: Int = 0,
-    var isLocked: Boolean = false,
-
-    var onClick: (() -> Unit)? = null
-)
-
-data class FoodRecordBean(
-    var records: MutableList<FoodRecord>? = null,
-    var total: Int,
-    var size: Int,
-    var current: Int,
-    var page: Int
-)
-
-data class GoodsRecordBean(
-    var records: MutableList<CookFoodGoodsEntity>? = null,
-    var total: Int,
-    var size: Int,
-    var current: Int,
-    var page: Int
-)
-
-data class SeasoningRecordBean(
-    var records: MutableList<SeasoningEntity>? = null,
-    var total: Int,
-    var size: Int,
-    var current: Int,
-    var page: Int
-)
-
-data class ResetReasoningRecord(
-    val list: MutableList<SeasoningEntity>
-)
-
-//data class DishDetailEntity(
-//    var foodId: String? = null,
-//    var foodWeight: Double? = null,
-//    var foodRealWeight: Double? = null,
-//    var voList: List<DishPartEntity>? = null
-//)
-
-//data class DishPartEntity(
-//    var foodId: String? = null,
-//    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/FoodRecord.kt

@@ -1,19 +0,0 @@
-package com.shuwei.dish.match.entity
-
-import java.io.Serializable
-
-data class FoodRecord(
-    var foodId: String? = null,
-    var foodName: String? = null,
-    var foodWeight: Double? = null,
-    var totalWeight: Double? = null,
-    var count: Int? = null,
-    var isCooking: Boolean = false,
-    //0-制作模式，1-采样模式，2-品控模式
-    var cookMode: Int = 0,
-    //1-早餐，2-午餐，3-晚餐
-    var dinnerType: String = "0",
-
-    var sort: Int = 0
-) : Serializable
-

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/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,36 +0,0 @@
-package com.shuwei.dish.match.http
-
-import com.shuwei.dish.match.base.BaseApp
-
-object UrlConfig {
-    private const val DEVICE_BASE_URL = "http://device.shuziweidao.com:8889"
-    /**
-     * device获取token
-     */
-    const val DEVICE_TOKEN = "${DEVICE_BASE_URL}/sys/getEquipmentToken"
-    /**
-     *获取配置信息
-     */
-    const val DEVICE_CONFIG = "${DEVICE_BASE_URL}/equipment/stEquipment/queryByEquipmentCode"
-
-//    const val BASE_URL = "http://vip.shuziweidao.com/shuwei-zhct"
-//    const val DISH_DETAIL = "$BASE_URL/scales/goodsUseList?foodId={foodId}&foodWeight={foodWeight}"
-//    const val DISH_LIST = "$BASE_URL/scales/getRestInfoFoods?eaId=99&type=0&foodName"
-
-//    const val BASE_URL = "http://192.168.1.207:9102"
-    const val BASE_URL = "https://yyjk.shuziweidao.com/gateway"
-//    const val DISH_LIST = "$BASE_URL/scales/getRestInfoFoods?eaId=99&type=0&foodName"
-
-
-    var DISH_DETAIL = "${BaseApp.configUrl}/food/stFoodInfoMatching/queryById"
-
-    // "$BASE_URL/scales/generateToken?deviceId=1111111111111111111111111111"
-
-    var GET_TOKEN = "${BaseApp.configUrl}/restaurant/equipment/stEquipment/getEquipmentToken"
-    var SUBMIT_DISH = "${BaseApp.configUrl}/food/stFoodInfoMatching/saveoredit"
-
-    var QUERY_GOODS_LIST = "${BaseApp.configUrl}/food/stFoodInfoMatching/queryGoodsInfoList"
-    var QUERY_FOOD_LIST = "${BaseApp.configUrl}/food/stFoodInfoMatching/list"
-    var SAMPLING_LIST = "${BaseApp.configUrl}/food/stFoodInfoMatching/queryHistorical/goodsInfoList"
-
-}

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

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

app/src/main/java/com/shuwei/dish/match/model/CookFoodDTO.kt

@@ -0,0 +1,43 @@
+package com.shuwei.dish.match.model
+
+import com.shuwei.dish.match.db.entity.CookFoodEntity
+import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
+import java.io.Serializable
+
+/**
+ * 菜品详情接口传输对象（DTO），不依赖 Room
+ * 对应接口：getConstituteByFoodId / saveConstitute
+ */
+data class CookFoodDTO(
+    var foodId: String = "",
+    var foodName: String? = null,
+    var canteenId: String? = null,
+    var foodWeight: Double = 0.0,
+    // 0-制作模式，1-采样模式，2-品控模式
+    var cookMode: Int = 0,
+    var dinnerType: String? = "0",
+    // 接口返回的食材构成列表
+    var matchingConstituteInfoList: MutableList<CookFoodGoodsDTO>? = null,
+    var foodConstituteList: MutableList<CookFoodGoodsDTO>? = null
+) : Serializable {
+
+    /**
+     * 转换为 Room 实体，用于写入本地数据库
+     * id/isDel/createTime 由 Room 自行管理，不从 DTO 携带
+     */
+    fun toEntity(): CookFoodEntity = CookFoodEntity(
+        foodId = foodId,
+        foodName = foodName,
+        canteenId = canteenId,
+        foodWeight = foodWeight,
+        cookMode = cookMode,
+        dinnerType = dinnerType
+    ).also { entity ->
+        entity.matchingConstituteInfoList = matchingConstituteInfoList
+            ?.map { it.toEntity() }
+            ?.toMutableList()
+        entity.foodConstituteList = foodConstituteList
+            ?.map { it.toEntity() }
+            ?.toMutableList()
+    }
+}

app/src/main/java/com/shuwei/dish/match/model/CookFoodGoodsDTO.kt

@@ -0,0 +1,119 @@
+package com.shuwei.dish.match.model
+
+import com.shuwei.dish.match.db.entity.CookFoodEntity
+import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
+import java.io.Serializable
+
+/**
+ * 菜品构成（主辅料/调料）接口传输对象（DTO），不依赖 Room
+ * 对应 CookFoodDTO 中 foodConstituteList、matchingConstituteInfoList 的元素
+ */
+data class CookFoodGoodsDTO(
+    var goodsId: String = "",
+    var goodsName: String? = null,
+    var foodId: String? = "",
+    var goodsOrRelationCode: String? = "",
+    // 调料数据顺序
+    var sort: Int = 0,
+    // 食材原材料：1，预制品：2
+    var relateionType: Int = 0,
+    // 物品类型：1主料 2辅料 3调料
+    var materialType: Int = 0,
+    // 物品 是否全部可食：true-全部可食，false-部分可食
+    var allEdible: Boolean = true,
+    // 物品 用料重量
+    var useWeight: Double? = 0.0,
+    var popularName: String? = "",
+    var canteenId: String? = "",
+    var relateionType_dictText: String? = "",
+    var zjmCode: String? = "",
+    var materId: String? = "",
+    // 物料编码
+    var goodsCode: String? = "",
+    // 净材种类
+    var rawMaterialsType: String? = null
+) : Serializable {
+
+    /**
+     * 转换为 GoodsItem，用于 UI 层
+     */
+    fun toGoodsItem(): GoodsItem = GoodsItem(
+        goodsId = goodsId,
+        goodsName = goodsName,
+        popularName = popularName,
+        zjmCode = zjmCode,
+        materId = materId,
+        materCode = goodsCode,
+        materialType = materialType,
+        useWeight = useWeight,
+        relateionType = relateionType,
+        allEdible = allEdible,
+        goodsOrRelationCode = goodsOrRelationCode,
+        rawMaterialsType = rawMaterialsType
+    )
+
+    /**
+     * 转换为 Room 实体，用于写入本地数据库
+     * id/pid/isDel/createTime 由 Room 自行管理，不从 DTO 携带
+     */
+    fun toEntity(): CookFoodGoodsEntity = CookFoodGoodsEntity(
+        goodsId = goodsId,
+        goodsName = goodsName,
+        foodId = foodId,
+        goodsOrRelationCode = goodsOrRelationCode,
+        sort = sort,
+        relateionType = relateionType,
+        materialType = materialType,
+        allEdible = allEdible,
+        useWeight = useWeight,
+        popularName = popularName,
+        canteenId = canteenId,
+        relateionType_dictText = relateionType_dictText,
+        zjmCode = zjmCode,
+        materId = materId,
+        goodsCode = goodsCode,
+        rawMaterialsType = rawMaterialsType
+    )
+}
+
+/**
+ * Room 实体 → DTO 反向映射，用于将本地数据转为接口提交格式
+ * id/pid/isDel/createTime 为本地数据库字段，不参与提交
+ */
+fun CookFoodGoodsEntity.toDTO(): CookFoodGoodsDTO = CookFoodGoodsDTO(
+    goodsId = goodsId,
+    goodsName = goodsName,
+    foodId = foodId,
+    goodsOrRelationCode = goodsOrRelationCode,
+    sort = sort,
+    relateionType = relateionType,
+    materialType = materialType,
+    allEdible = allEdible,
+    useWeight = useWeight,
+    popularName = popularName,
+    canteenId = canteenId,
+    relateionType_dictText = relateionType_dictText,
+    zjmCode = zjmCode,
+    materId = materId,
+    goodsCode = goodsCode,
+    rawMaterialsType = rawMaterialsType
+)
+
+/**
+ * Room 实体 → DTO 反向映射，用于将本地数据转为接口提交格式
+ * id/isDel/createTime 为本地数据库字段，不参与提交
+ */
+fun CookFoodEntity.toDTO(): CookFoodDTO = CookFoodDTO(
+    foodId = foodId,
+    foodName = foodName,
+    canteenId = canteenId,
+    foodWeight = foodWeight,
+    cookMode = cookMode,
+    dinnerType = dinnerType,
+    matchingConstituteInfoList = matchingConstituteInfoList
+        ?.map { it.toDTO() }
+        ?.toMutableList(),
+    foodConstituteList = foodConstituteList
+        ?.map { it.toDTO() }
+        ?.toMutableList()
+)

app/src/main/java/com/shuwei/dish/match/model/CookOrderModels.kt

@@ -0,0 +1,146 @@
+package com.shuwei.dish.match.model
+
+/**
+ * 当日烹饪任务列表（按餐次分组）请求参数
+ * 对应接口: POST /neglect/ratio-scale/cook-orders/page
+ */
+data class CookOrderPageRequest(
+    /** 计划日期 yyyy-MM-dd，默认当天 */
+    val date: String? = null,
+    /** 餐次筛选: 1=早餐 / 2=午餐 / 3=晚餐 / 4=加餐，不传返回全部 */
+    val mealType: Int? = null,
+    /** 菜品名称模糊搜索 */
+    val keyword: String? = null,
+    /** 保留字段，当前不使用 */
+    val pageNum: Int? = null,
+    /** 保留字段，当前不使用 */
+    val pageSize: Int? = null
+)
+
+/**
+ * 餐次分组，包含该餐次下的烹制单列表
+ */
+data class CookOrderMealGroup(
+    /** 餐次: 1=早餐 / 2=午餐 / 3=晚餐 / 4=加餐 */
+    val mealType: Int = 0,
+    /** 餐次中文名称 */
+    val mealTypeName: String = "",
+    /** 该餐次下的烹制单列表 */
+    val cookOrders: List<CookOrderItem> = emptyList()
+)
+
+/**
+ * 单个烹制单，对应接口响应中 cookOrders 数组的条目
+ * 注意: Long 类型字段服务端序列化为 String
+ */
+data class CookOrderItem(
+    /** 烹制单id（Long → String） */
+    val cookOrderId: String = "",
+    /** 烹制单号 */
+    val cookNo: String = "",
+    /** 菜品名称 */
+    val dishName: String = "",
+    /** 菜品id（关联 nut_food） */
+    val foodId: String = "",
+    /** 餐次: 1=早餐 / 2=午餐 / 3=晚餐 / 4=加餐 */
+    val mealType: Int = 0,
+    /** 餐次中文名称 */
+    val mealTypeName: String = "",
+    /** 烹制状态: 0=待烹制 / 1=烹制中 / 2=已完成 / 3=异常 */
+    val cookStatus: Int = 0,
+    /** 烹制状态中文 */
+    val cookStatusName: String = "",
+    /** 生重(kg)，烹制完成后才有值 */
+    val rawWeight: Double? = null,
+    /** 熟重(kg)，烹制完成后才有值 */
+    val cookedWeight: Double? = null,
+    /** 需求份数 */
+    val needPortions: Int = 0,
+    /** 烹制份数，烹制完成后才有值 */
+    val cookedPortions: Int? = null
+)
+
+/**
+ * 菜品食材构成（主材+辅材），对应接口响应中单个食材
+ * 对应接口: GET /neglect/ratio-scale/cook-orders/{cookOrderId}/composition
+ * 注意: 此接口仅返回主材(ingredientClass=1)和辅材(ingredientClass=2)，不含调料
+ */
+data class CookOrderCompositionItem(
+    /** 食材id */
+    val materId: String = "",
+    /** 食材名称 */
+    val ingredientName: String = "",
+    /** 食材分类: 1=主材 / 2=辅材 */
+    val ingredientClass: Int = 0,
+    /** 食材分类中文名称 */
+    val ingredientClassName: String = "",
+    /** 标准用量(g) */
+    val useWeight: Double = 0.0,
+    /** 净菜类型id */
+    val vegTypeId: String = ""
+)
+
+// ==================== 调料模糊搜索 ====================
+
+/**
+ * 调料模糊搜索请求参数
+ * 对应接口: POST /neglect/ratio-scale/seasoning-search
+ * 数据源: nut_mater_base 一级分类为 18(糖蜜饯)、19(油脂)、20(调味品)
+ */
+data class SeasoningSearchRequest(
+    /** 模糊匹配食材名称和别名，为空时返回全部 */
+    val keyword: String? = null,
+    /** 页码 */
+    val pageNum: Int = 1,
+    /** 每页条数 */
+    val pageSize: Int = 20
+)
+
+/**
+ * 调料模糊搜索结果条目
+ * 注意: Long 类型字段服务端序列化为 String
+ */
+data class SeasoningSearchItem(
+    /** 食材id（Long → String） */
+    val id: String = "",
+    /** 食材名称 */
+    val materName: String = "",
+    /** 食材编码 */
+    val materCode: String = "",
+    /** 别名 */
+    val alias: String = "",
+    /** 归属食堂id（Long → String） */
+    val canteenId: String = ""
+)
+
+// ==================== 烹饪完成 ====================
+
+/**
+ * 烹饪完成 — 单个食材用量条目
+ * 对应接口: POST /neglect/ratio-scale/cook-orders/complete
+ */
+data class CookCompleteItem(
+    /** 食材id */
+    val materId: String = "",
+    /** 实际用量(g) */
+    val actualQty: Double = 0.0,
+    /** 调料首次使用时间 yyyy-MM-dd HH:mm:ss，仅调料需要，主辅材留空 */
+    val putTime: String? = null
+)
+
+/**
+ * 烹饪完成请求，一次性提交主辅材用量+熟重+调料
+ * 对应接口: POST /neglect/ratio-scale/cook-orders/complete
+ */
+data class CookCompleteRequest(
+    /** 烹制单id */
+    val cookOrderId: String = "",
+    /** 烹饪开始时间 yyyy-MM-dd HH:mm:ss，进入提交页面时刻 */
+    val cookStart: String? = null,
+    /** 主辅材实际用量列表，至少1条 */
+    val items: List<CookCompleteItem> = emptyList(),
+    /** 熟重(kg) */
+    val cookedWeight: Double = 0.0,
+    /** 调料用量列表，选填 */
+    val seasonings: List<CookCompleteItem>? = null
+)

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

@@ -0,0 +1,52 @@
+package com.shuwei.dish.match.model
+
+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,
+    var isLocked: Boolean = false,
+
+    var onClick: (() -> Unit)? = null
+)
+
+data class FoodCollectionBean(
+    var imageUri: Uri? = null,
+    var bitmap: Bitmap? = null,
+    var imageFile: File? = null,
+    var imageVector: FloatArray? = null,
+    var isShowCamera: Boolean = false,
+    var isFinish:Boolean = false,
+    var uploadSuccess:Boolean = false
+) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as FoodCollectionBean
+
+        if (isShowCamera != other.isShowCamera) return false
+        if (isFinish != other.isFinish) return false
+        if (uploadSuccess != other.uploadSuccess) return false
+        if (imageUri != other.imageUri) return false
+        if (bitmap != other.bitmap) return false
+        if (imageFile != other.imageFile) return false
+        if (!imageVector.contentEquals(other.imageVector)) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = isShowCamera.hashCode()
+        result = 31 * result + isFinish.hashCode()
+        result = 31 * result + uploadSuccess.hashCode()
+        result = 31 * result + (imageUri?.hashCode() ?: 0)
+        result = 31 * result + (bitmap?.hashCode() ?: 0)
+        result = 31 * result + (imageFile?.hashCode() ?: 0)
+        result = 31 * result + (imageVector?.contentHashCode() ?: 0)
+        return result
+    }
+}

app/src/main/java/com/shuwei/dish/match/model/FoodRecord.kt

@@ -0,0 +1,26 @@
+package com.shuwei.dish.match.model
+
+import java.io.Serializable
+
+data class FoodRecord(
+    var foodId: String? = null,
+    var foodName: String? = null,
+    var foodWeight: Double? = null,
+    var totalWeight: Double? = null,
+    var count: Int? = null,
+    var isCooking: Boolean = false,
+    //0-制作模式，1-采样模式，2-品控模式
+    var cookMode: Int = 0,
+    //1-早餐，2-午餐，3-晚餐
+    var dinnerType: String = "0",
+    //true-原始数据，false-非原始数据
+    var isOriginalData: Boolean = true,
+    var sort: Int = 0,
+    // ===== 已提交采样列表（sample-list）扩展字段，制作模式不涉及 =====
+    /** 实验编号（innovNo） */
+    var innovNo: String? = null,
+    /** 实验状态: 1=实验中 / 2=已评测 / 9=已转化 */
+    var status: Int? = null,
+    /** 实验状态中文 */
+    var statusName: String? = null
+) : Serializable

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

@@ -0,0 +1,85 @@
+package com.shuwei.dish.match.model
+
+import com.shuwei.dish.match.db.entity.CookFoodGoodsEntity
+import com.shuwei.dish.match.db.entity.SeasoningEntity
+import java.io.Serializable
+
+/**
+ * 物品信息接口返回的数据类（DTO），不依赖 Room，同时承载 UI 状态字段
+ * 对应接口：queryGoodsInfoList，食材（goodsType=0）和调料（goodsType=1）共用此结构
+ */
+data class GoodsItem(
+    // 接口返回字段
+    var goodsId: String = "",
+    val goodsName: String? = null,
+    val popularName: String? = null,
+    val zjmCode: String? = null,
+    var materId: String? = null,
+    val materCode: 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,
+    // true-用户手动指定了主辅材，updateMaterialTypes 自动分配时跳过
+    var isMaterialTypeManual: Boolean = false,
+    // 识图匹配分数，-1 表示不显示
+    var foodScore: Int = -1,
+    // 净材种类（当前选中值）
+    var rawMaterialsType: String? = null,
+    // 净材种类候选列表（临时字段，逗号分隔，不持久化）
+    var rawMaterialsTypes: String? = null,
+    var oldGoodsId: String? = null
+) : Serializable {
+
+    /**
+     * 物料编码，与查询接口返回的 materCode 同值，统一对外暴露为 goodsCode 供下游使用
+     */
+    val goodsCode: String? get() = materCode
+
+    /**
+     * 转换为 CookFoodGoodsEntity，用于写入数据库或传给 SubmitFoodActivity
+     */
+    fun toCookFoodGoodsEntity(): CookFoodGoodsEntity = CookFoodGoodsEntity(
+        goodsId = goodsId,
+        goodsName = goodsName,
+        popularName = popularName,
+        zjmCode = zjmCode,
+        materId = materId,
+        goodsCode = goodsCode,
+        materialType = materialType,
+        useWeight = useWeight,
+        relateionType = relateionType,
+        allEdible = allEdible,
+        goodsOrRelationCode = goodsOrRelationCode,
+        rawMaterialsType = rawMaterialsType
+    )
+
+    /**
+     * 转换为 SeasoningEntity，用于保存调料完整信息到 dm_seasoning
+     */
+    fun toSeasoningEntity(): SeasoningEntity = SeasoningEntity(
+        goodsId = goodsId,
+        goodsName = goodsName,
+        popularName = popularName,
+        zjmCode = zjmCode,
+        materId = materId,
+        goodsCode = goodsCode,
+        materialType = materialType,
+        relateionType = relateionType,
+        allEdible = allEdible,
+        goodsOrRelationCode = goodsOrRelationCode,
+        rawMaterialsType = rawMaterialsType
+    )
+}

app/src/main/java/com/shuwei/dish/match/model/GoodsNameQueryDTO.kt

@@ -0,0 +1,12 @@
+package com.shuwei.dish.match.model
+
+/**
+ * 物品名称批量查询入参 DTO
+ * 用于 queryGoodsInfoList 接口 goodsNames 字段的元素类型
+ * @param goodsName 物品名称
+ * @param rawMaterialsType 净材种类
+ */
+data class GoodsNameQueryDTO(
+    val goodsName: String,
+    val rawMaterialsType: String
+)

app/src/main/java/com/shuwei/dish/match/model/SampleModels.kt

@@ -0,0 +1,251 @@
+package com.shuwei.dish.match.model
+
+/**
+ * 采样与制作模式相关模型，对应配比秤接口（Controller: NutRatioScaleController）
+ * 路径前缀: /neglect/ratio-scale
+ * 序列化规则: Long 字段服务端返回字符串；请求体字段按后端约定（id 类字段用 String 与现有代码一致）
+ */
+
+/** 采样实验状态（味养创新 nut_innovation.status） */
+object SampleStatus {
+    /** 实验中 */
+    const val EXPERIMENTING = 1
+    /** 已评测 */
+    const val EVALUATED = 2
+    /** 已转化 */
+    const val CONVERTED = 9
+}
+
+// ==================== 一、食材模糊搜索 ====================
+
+/**
+ * 食材模糊搜索请求参数
+ * 对应接口: POST /neglect/ratio-scale/mater-search
+ * 数据源: nut_mater_base，限定设备对应食堂
+ */
+data class MaterSearchRequest(
+    /** 模糊匹配食材名称和别名，为空时返回全部 */
+    val keyword: String? = null,
+    /** 页码 */
+    val pageNum: Int = 1,
+    /** 每页条数 */
+    val pageSize: Int = 20
+)
+
+/**
+ * 食材模糊搜索结果条目
+ * 注意: id / canteenId 为 Long 类型，服务端序列化为 String
+ */
+data class MaterSearchItem(
+    /** 食材id（Long → String，提交构成 items.materId 使用） */
+    val id: String = "",
+    /** 食材名称 */
+    val materName: String = "",
+    /** 食材编码（一级+二级+自编码，全局唯一） */
+    val materCode: String = "",
+    /** 别名，可能为 null */
+    val alias: String? = null,
+    /** 食材一级分类 */
+    val materFirstClass: String? = null,
+    /** 食材二级分类 */
+    val materSecondClass: String? = null,
+    /** 食材图片url */
+    val materUrl: String? = null,
+    /** 归属食堂id（Long → String） */
+    val canteenId: String = ""
+)
+
+// ==================== 二、搜菜品 ====================
+
+/**
+ * 搜菜品请求参数（制作模式选已有菜品）
+ * 对应接口: POST /neglect/ratio-scale/food-search
+ * 数据源: nut_food（status=1 上架）
+ */
+data class FoodSearchRequest(
+    /** 菜品名称或编号模糊搜索 */
+    val keyword: String? = null,
+    /** 页码 */
+    val pageNum: Int = 1,
+    /** 每页条数 */
+    val pageSize: Int = 20
+)
+
+/**
+ * 搜菜品结果条目
+ * 注意: foodId 为 Long 类型，服务端序列化为 String
+ */
+data class FoodSearchItem(
+    /** 菜品id（Long → String） */
+    val foodId: String = "",
+    /** 菜品编号 */
+    val foodCode: String = "",
+    /** 菜品名称 */
+    val foodName: String = ""
+)
+
+// ==================== 三、查菜品构成 ====================
+
+/**
+ * 查菜品构成响应 — 单个食材
+ * 对应接口: GET /neglect/ratio-scale/food/{foodId}/composition
+ */
+data class FoodCompositionIngredient(
+    /** 食材id（Long → String） */
+    val materId: String = "",
+    /** 食材名称 */
+    val materName: String = "",
+    /** 用量(g) */
+    val useWeight: Double = 0.0,
+    /** 1=主材 / 2=辅材 / 3=调料 */
+    val isMain: Int = 0,
+    /** 分类中文名 */
+    val isMainName: String = ""
+)
+
+/**
+ * 查菜品构成响应（主辅料+调料 + 熟重）
+ * 对应接口: GET /neglect/ratio-scale/food/{foodId}/composition
+ */
+data class FoodCompositionResponse(
+    /** 菜品id（Long → String） */
+    val foodId: String = "",
+    /** 菜品名称 */
+    val foodName: String = "",
+    /** 熟重(g)，从 nut_food_cook.output_weight 反查 */
+    val foodWeight: Double = 0.0,
+    /** 食材构成列表 */
+    val ingredients: List<FoodCompositionIngredient> = emptyList()
+)
+
+// ==================== 四、提交采样 ====================
+
+/**
+ * 提交采样 — 单个食材构成条目
+ * 对应接口: POST /neglect/ratio-scale/constitute/save
+ */
+data class ConstituteSaveItem(
+    /** 食材id（nut_mater_base.id） */
+    val materId: String = "",
+    /** 食材称量用量(g)，必须 > 0 */
+    val useWeight: Double = 0.0,
+    /** 食材分类: 1=主材 / 2=辅材 / 3=调料 */
+    val isMain: Int = 0
+)
+
+/**
+ * 提交采样请求（落库味养创新实验，status=1 实验中）
+ * 对应接口: POST /neglect/ratio-scale/constitute/save
+ * 制作模式已废弃本接口，统一为提交采样，不再传 cookMode/foodId
+ */
+data class ConstituteSaveRequest(
+    /** 菜品名称 */
+    val foodName: String? = null,
+    /** 熟重(g)，必须 > 0 */
+    val foodWeight: Double = 0.0,
+    /** 食材构成列表，至少 1 条 */
+    val items: List<ConstituteSaveItem> = emptyList()
+)
+
+// ==================== 五、已提交采样列表 ====================
+
+/**
+ * 已提交采样列表查询请求参数
+ * 对应接口: POST /neglect/ratio-scale/sample-list
+ * 数据源: nut_innovation（source=2 配比秤采样），按提交时间倒序，不分日期
+ */
+data class SampleHistoryRequest(
+    /** 页码 */
+    val pageNum: Int = 1,
+    /** 每页条数 */
+    val pageSize: Int = 10
+)
+
+/**
+ * 已提交采样列表结果条目
+ * 注意: innovId 为 Long 类型，服务端序列化为 String
+ */
+data class SampleHistoryItem(
+    /** 味养创新实验id（Long → String） */
+    val innovId: String = "",
+    /** 实验编号 */
+    val innovNo: String = "",
+    /** 餐品名称 */
+    val foodName: String = "",
+    /** 熟重(g) */
+    val foodWeight: Double = 0.0,
+    /** 状态: 1=实验中 / 2=已评测 / 9=已转化 */
+    val status: Int = 0,
+    /** 状态中文 */
+    val statusName: String = "",
+    /** 提交时间 */
+    val createTime: String = ""
+)
+
+// ==================== 六、制作历史 ====================
+
+/**
+ * 制作历史查询请求参数
+ * 对应接口: POST /neglect/ratio-scale/make/history
+ * 数据源: nut_food_matching_use，按设备过滤
+ */
+data class MakeHistoryRequest(
+    /** 页码 */
+    val pageNum: Int = 1,
+    /** 每页条数 */
+    val pageSize: Int = 10,
+    /** 制作日期 yyyy-MM-dd，不传查全部 */
+    val day: String? = null
+)
+
+/**
+ * 制作历史结果条目
+ * 注意: id / foodId 为 Long 类型，服务端序列化为 String
+ */
+data class MakeHistoryItem(
+    /** 制作记录id（Long → String） */
+    val id: String = "",
+    /** 菜品id（Long → String） */
+    val foodId: String = "",
+    /** 菜品名称 */
+    val foodName: String = "",
+    /** 熟重(g) */
+    val foodWeight: Double = 0.0,
+    /** 餐次: 1=早餐/2=午餐/3=晚餐/4=加餐 */
+    val mealType: Int = 0,
+    /** 餐次中文 */
+    val mealTypeName: String = "",
+    /** 制作日期 */
+    val day: String = "",
+    /** 制作时间 */
+    val createTime: String = ""
+)
+
+// ==================== 七、制作历史图表 ====================
+
+/**
+ * 制作历史图表 — 横轴项
+ * 对应接口: GET /neglect/ratio-scale/make/history/{foodId}
+ */
+data class MakeHistoryChartAxis(
+    /** 食材id（时间/熟重项为空字符串） */
+    val goodId: String = "",
+    /** 项名称（时间/熟重/食材名称） */
+    val goodName: String = ""
+)
+
+/**
+ * 制作历史图表 — 纵轴值
+ * value 为 String(时间项) 或 Double(数值项)
+ */
+data class MakeHistoryChartValue(
+    val value: Any? = null
+)
+
+/**
+ * 制作历史图表 — 单条记录（xAxes 与 yAxes 一一对应）
+ */
+data class MakeHistoryChartRow(
+    val xAxes: List<MakeHistoryChartAxis> = emptyList(),
+    val yAxes: List<MakeHistoryChartValue> = emptyList()
+)

app/src/main/java/com/shuwei/dish/match/model/SettingItem.kt

@@ -0,0 +1,40 @@
+package com.shuwei.dish.match.model
+
+/**
+ * 设置页面的列表项实体类
+ *
+ * @param type 菜单项类型，用于唯一标识每一项
+ * @param title 主标题文字
+ * @param subtitle 副标题文字，仅部分项目（如菜品模式）有值
+ * @param isHidden 是否为隐藏项，隐藏项需触发开发者模式后才显示
+ * @param onClick 点击回调，初始化时直接注入对应的业务逻辑
+ */
+data class SettingItem(
+    val type: Type,
+    val title: String,
+    val subtitle: String? = null,
+    val isHidden: Boolean = false,
+    val onClick: () -> Unit
+) {
+    /** 设置菜单项类型枚举 */
+    enum class Type {
+        /** 菜品模式切换 */
+        COOK_MODE,
+        /** 调料区设置 */
+        SEASONING_CONFIG,
+        /** 食材采集 */
+        FOOD_COLLECT,
+        /** 减重配置 */
+        WEIGHT_CONFIG,
+        /** 数据库查看（隐藏项） */
+        DB_INSPECT,
+        /** 秤数据监控（隐藏项） */
+        SCALE_OBSERVE,
+        /** 切换环境（隐藏项） */
+        ENV_SWITCH,
+        /** 数据清除（隐藏项） */
+        CLEAR_DATA,
+        /** 测试调料拿取（隐藏项） */
+        TEST_SEASONING,
+    }
+}

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

@@ -0,0 +1,131 @@
+package com.shuwei.dish.match.net
+
+import com.google.gson.JsonSyntaxException
+import com.shuwei.dish.match.utils.ext.toJsonString
+import com.shuwei.dish.match.utils.ext.toObject
+import com.shuwei.dish.match.utils.ext.toType
+import org.apache.http.conn.ConnectTimeoutException
+import retrofit2.HttpException
+import java.io.IOException
+import java.net.SocketTimeoutException
+import java.net.UnknownHostException
+
+///**
+// * 通用网络请求封装，统一处理异常
+// * @param onRequest 实际的 Retrofit 接口请求
+// * @param onSuccess 成功回调
+// * @param onFailure 自定义错误回调（可选，不传则用默认提示）
+// */
+//suspend fun <T> apiRequest(
+//    onRequest: suspend () -> T,
+//    onSuccess: (T) -> Unit,
+//    onFailure: ((ApiException) -> Unit)? = null
+//) {
+//    try {
+//        // 执行实际的网络请求
+//        val result = onRequest()
+//        onSuccess(result)
+//    } catch (e: Exception) {
+//        val apiException = getApiException(e)
+//        // 优先执行自定义错误回调，没有则用默认提示
+//        if (onFailure != null) {
+//            onFailure(apiException)
+//        } else {
+//            // 默认的错误提示（可根据 ErrorType 定制）
+//            val tip = apiException.errorMsg
+//            // 切换到UI线程弹提示（用 MainScope 确保在主线程）
+//            MainScope().launch {
+//                BaseApp.instance?.toast(tip)
+//            }
+//        }
+//    }
+//}
+
+/**
+ * 通用网络请求封装，统一处理异常
+ * @param onRequest 实际的 Retrofit 接口请求
+ * @param onSuccess 成功回调
+ * @param onFailure 自定义错误回调（可选，不传则用默认提示）
+ */
+@Suppress("UNCHECKED_CAST")
+suspend fun <T> request(
+    onRequest: suspend () -> ApiResponse<T>,
+    onSuccess: (T) -> Unit,
+    onFailure: (String, String) -> Unit
+) {
+    var response: ApiResponse<T>?
+    try {
+        // 执行实际的网络请求
+        response = onRequest()
+    } catch (e: Exception) {
+        val apiException = getApiException(e)
+        onFailure("-1", apiException.errorMsg)
+        return
+    }
+    if (response.isSuccess()) {
+        onSuccess(response.data as T)
+    } else {
+        onFailure(response.code, response.msg ?: "")
+    }
+}
+
+data class CodeMsg(
+    var code: String? = null,
+    var msg: String? = null
+)
+
+@Suppress("DEPRECATION")
+fun getApiException(e: Exception): ApiException {
+    // 捕获各类网络异常并转换为自定义异常
+    return when (e) {
+        is HttpException -> httpException2ApiException(e)
+
+        is JsonSyntaxException -> ApiException(
+            ErrorType.NETWORK_ERROR,
+            errorMsg = "服务器响应异常，请稍后重试"
+        )
+
+        is UnknownHostException -> ApiException(
+            ErrorType.NETWORK_ERROR,
+            errorMsg = "网络未连接，请检查网络"
+        )
+
+        is SocketTimeoutException -> ApiException(
+            ErrorType.TIMEOUT_ERROR,
+            errorMsg = "请求超时，请稍后重试"
+        )
+
+        is ConnectTimeoutException -> ApiException(
+            ErrorType.TIMEOUT_ERROR,
+            errorMsg = "连接超时，请检查网络"
+        )
+
+        is IOException -> ApiException(
+            ErrorType.NETWORK_ERROR,
+            errorMsg = "网络异常：${e.message ?: "未知IO错误"}"
+        )
+
+        is ApiException -> e
+        else -> ApiException(
+            ErrorType.UNKNOWN_ERROR,
+            errorMsg = "未知错误：${e.message ?: "未知"}",
+            throwable = e
+        )
+    }
+}
+
+fun httpException2ApiException(e: HttpException): ApiException {
+    val body = e.response()?.errorBody()?.string()
+    val codeMsg: CodeMsg? = try {
+        body?.toObject<CodeMsg>()
+    } catch (_: Exception) {
+        null
+    }
+    return ApiException(
+        ErrorType.NETWORK_ERROR,
+        errorMsg = if (codeMsg == null) "数据解析异常(${e.code()})"
+                   else codeMsg.msg ?: "服务器错误(${e.code()})"
+    )
+}
+
+

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

@@ -0,0 +1,196 @@
+package com.shuwei.dish.match.net
+
+import com.shuwei.dish.match.base.GlobalData
+import com.shuwei.dish.match.model.CookFoodDTO
+import com.shuwei.dish.match.model.CookOrderCompositionItem
+import com.shuwei.dish.match.model.CookOrderMealGroup
+import com.shuwei.dish.match.model.CookOrderPageRequest
+import com.shuwei.dish.match.model.FoodRecord
+import com.shuwei.dish.match.model.GoodsItem
+import com.shuwei.dish.match.model.ConstituteSaveRequest
+import com.shuwei.dish.match.model.CookCompleteRequest
+import com.shuwei.dish.match.model.FoodCompositionResponse
+import com.shuwei.dish.match.model.FoodSearchItem
+import com.shuwei.dish.match.model.FoodSearchRequest
+import com.shuwei.dish.match.model.MakeHistoryChartRow
+import com.shuwei.dish.match.model.MakeHistoryItem
+import com.shuwei.dish.match.model.MakeHistoryRequest
+import com.shuwei.dish.match.model.MaterSearchItem
+import com.shuwei.dish.match.model.MaterSearchRequest
+import com.shuwei.dish.match.model.SampleHistoryItem
+import com.shuwei.dish.match.model.SampleHistoryRequest
+import com.shuwei.dish.match.model.SeasoningSearchItem
+import com.shuwei.dish.match.model.SeasoningSearchRequest
+import okhttp3.MultipartBody
+import okhttp3.RequestBody
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.Multipart
+import retrofit2.http.POST
+import retrofit2.http.Part
+import retrofit2.http.PartMap
+import retrofit2.http.Path
+import retrofit2.http.Query
+import retrofit2.http.Url
+
+interface ApiService {
+
+    /**
+     * 查询菜品详情
+     */
+    @GET
+    suspend fun getFoodDetail(
+        @Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/matching/app/getConstituteByFoodId",
+        @Query("foodId") foodId: String
+    ): ApiResponse<CookFoodDTO?>
+
+
+    /**
+     * 提交制作菜品
+     */
+    @POST
+    suspend fun submitCookFood(
+        @Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/matching/app/saveConstitute",
+        @Body param: CookFoodDTO
+    ): ApiResponse<Any?>
+
+    /**
+     * 搜索菜品（旧接口，采样模式仍在使用）
+     */
+    @POST
+    suspend fun searchFoodList(
+        @Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/matching/app/queryPageList",
+        @Body param: MutableMap<String, Any>
+    ): ApiResponse<MutableList<FoodRecord>?>
+
+    /**
+     * 采样数据
+     */
+    @POST
+    suspend fun getSamplingList(
+        @Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/matching/app/queryHistoryGoodsInfoList",
+        @Body param: MutableMap<String, Any>
+    ): ApiResponse<MutableList<FoodRecord>?>
+
+    /**
+     * 物品信息（食材 goodsType=0，调料 goodsType=1 共用此接口）
+     */
+    @POST
+    suspend fun queryGoodsList(
+        @Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/matching/app/queryGoodsInfoList",
+        @Body param: MutableMap<String, Any>
+    ): ApiResponse<MutableList<GoodsItem>?>
+
+    /**
+     * 提交采集图片数据
+     */
+    @Multipart
+    @POST
+    suspend fun uploadFoodVectorData(
+        @Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/matching/app/addWeighingCollectionData",
+        @PartMap params: MutableMap<String, RequestBody>,
+        @Part foodPics: List<MultipartBody.Part>
+    ): ApiResponse<List<String>?>
+
+
+
+    /**
+     * 查询当日烹饪任务列表（按餐次分组），新配比秤接口
+     */
+    @POST
+    suspend fun getCookOrderPage(
+        @Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/ratio-scale/cook-orders/list",
+        @Body request: CookOrderPageRequest
+    ): ApiResponse<List<CookOrderMealGroup>?>
+
+    /**
+     * 查询菜品食材构成（主材+辅材，不含调料），新配比秤接口
+     */
+    @GET("nutrition/neglect/ratio-scale/cook-orders/{cookOrderId}/composition")
+    suspend fun getCookOrderComposition(
+        @Path("cookOrderId") cookOrderId: String
+    ): ApiResponse<List<CookOrderCompositionItem>?>
+
+    /**
+     * 调料模糊搜索，新配比秤接口
+     * 数据源: nut_mater_base 一级分类为 18(糖蜜饯)、19(油脂)、20(调味品)
+     */
+    @POST
+    suspend fun getSeasoningSearch(
+        @Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/ratio-scale/seasoning-search",
+        @Body request: SeasoningSearchRequest
+    ): ApiResponse<List<SeasoningSearchItem>?>
+
+    /**
+     * 烹饪完成：提交主辅材用量+熟重+调料，一次性完成烹制
+     * 新配比秤接口，替代旧 saveConstitute
+     */
+    @POST
+    suspend fun cookOrderComplete(
+        @Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/ratio-scale/cook-orders/complete",
+        @Body request: CookCompleteRequest
+    ): ApiResponse<Any?>
+
+    /**
+     * 食材模糊搜索（采样/制作通用，称量前检索食材）
+     * 数据源: nut_mater_base，限定设备对应食堂，模糊匹配名称和别名
+     */
+    @POST
+    suspend fun materSearch(
+        @Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/ratio-scale/mater-search",
+        @Body request: MaterSearchRequest
+    ): ApiResponse<MutableList<MaterSearchItem>?>
+
+    /**
+     * 搜菜品（制作模式选已有上架菜品）
+     */
+    @POST
+    suspend fun foodSearch(
+        @Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/ratio-scale/food-search",
+        @Body request: FoodSearchRequest
+    ): ApiResponse<MutableList<FoodSearchItem>?>
+
+    /**
+     * 查菜品构成（制作模式查看已有菜品主辅料+调料 + 熟重）
+     */
+    @GET("nutrition/neglect/ratio-scale/food/{foodId}/composition")
+    suspend fun getFoodComposition(
+        @Path("foodId") foodId: String
+    ): ApiResponse<FoodCompositionResponse?>
+
+    /**
+     * 提交采样（落库味养创新实验，制作模式已废弃本接口）
+     */
+    @POST
+    suspend fun constituteSave(
+        @Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/ratio-scale/constitute/save",
+        @Body request: ConstituteSaveRequest
+    ): ApiResponse<Any?>
+
+    /**
+     * 已提交采样列表（本食堂 source=2，按提交时间倒序，不分日期）
+     */
+    @POST
+    suspend fun sampleHistory(
+        @Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/ratio-scale/sample-list",
+        @Body request: SampleHistoryRequest
+    ): ApiResponse<MutableList<SampleHistoryItem>?>
+
+    /**
+     * 制作历史（本设备，按日期可选过滤）
+     */
+    @POST
+    suspend fun makeHistory(
+        @Url url: String = "${GlobalData.appBaseUrl}/nutrition/neglect/ratio-scale/make/history",
+        @Body request: MakeHistoryRequest
+    ): ApiResponse<MutableList<MakeHistoryItem>?>
+
+    /**
+     * 制作历史图表（按菜品id）
+     */
+    @GET("nutrition/neglect/ratio-scale/make/history/{foodId}")
+    suspend fun makeHistoryChart(
+        @Path("foodId") foodId: String
+    ): ApiResponse<MutableList<MakeHistoryChartRow>?>
+
+}

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

@@ -0,0 +1,19 @@
+package com.shuwei.dish.match.net
+
+// 1. 网络异常类型枚举
+enum class ErrorType {
+    NETWORK_ERROR,        // 网络错误（无网）
+    TIMEOUT_ERROR,        // 超时
+    SERVER_ERROR,         // 服务器错误（5xx）
+    CLIENT_ERROR,         // 客户端错误（4xx）
+    PARSE_ERROR,          // 数据解析错误
+    UNKNOWN_ERROR         // 未知错误
+}
+
+// 2. 自定义网络异常类
+class ApiException(
+    val errorType: ErrorType,
+    val errorCode: Int = -1,
+    val errorMsg: String,
+    val throwable: Throwable? = null
+) : Exception(errorMsg, throwable)

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

@@ -0,0 +1,40 @@
+//package com.shuwei.dish.match.net
+//
+//import android.annotation.SuppressLint
+//import okhttp3.Interceptor
+//import okhttp3.Response
+//import org.apache.http.conn.ConnectTimeoutException
+//import java.io.IOException
+//import java.net.SocketTimeoutException
+//import java.net.UnknownHostException
+//
+//class ExceptionInterceptor : Interceptor {
+//    @SuppressLint("SuspiciousIndentation")
+//    override fun intercept(chain: Interceptor.Chain): Response {
+//        val request = chain.request()
+//          try {
+//            val response = chain.proceed(request)
+//            // 拦截 HTTP 状态码异常（4xx/5xx）
+//            if (!response.isSuccessful) {
+//                val e = ApiException(
+//                    errorType = if (response.code >= 500) ErrorType.SERVER_ERROR else ErrorType.CLIENT_ERROR,
+//                    errorCode = response.code,
+//                    errorMsg = "HTTP错误：${response.code}"
+//                )
+//                throw e
+//            }
+//            return response
+//        } catch (e: Exception) {
+//            // 捕获各类网络异常并转换为自定义异常
+//            val apiException = when (e) {
+//                is UnknownHostException -> ApiException(ErrorType.NETWORK_ERROR, errorMsg = "网络未连接，请检查网络")
+//                is SocketTimeoutException -> ApiException(ErrorType.TIMEOUT_ERROR, errorMsg = "请求超时，请稍后重试")
+//                is ConnectTimeoutException -> ApiException(ErrorType.TIMEOUT_ERROR, errorMsg = "连接超时，请检查网络")
+//                is IOException -> ApiException(ErrorType.NETWORK_ERROR, errorMsg = "网络异常：${e.message ?: "未知IO错误"}")
+//                is ApiException -> e // 已转换的异常直接抛出
+//                else -> ApiException(ErrorType.UNKNOWN_ERROR, errorMsg = "未知错误：${e.message ?: "未知"}", throwable = e)
+//            }
+//            throw apiException
+//        }
+//    }
+//}

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

@@ -1,20 +1,38 @@
-package com.shuwei.dish.match.http
+package com.shuwei.dish.match.net
 
 import android.annotation.SuppressLint
 import android.util.Log
-import okhttp3.Call
+import com.shuwei.dish.match.base.GlobalData
-import okhttp3.Interceptor
 import okhttp3.OkHttpClient
-import okhttp3.Request
+import okhttp3.logging.HttpLoggingInterceptor
-import okhttp3.Response
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
 import java.util.concurrent.TimeUnit
 
 import javax.net.ssl.*
 import java.security.SecureRandom
 import java.security.cert.X509Certificate
+import kotlin.apply
+import kotlin.jvm.java
 
-class HttpClient private constructor() {
+val apiService: ApiService = Retrofit.Builder()
-    private val client: OkHttpClient by lazy {
+    .baseUrl(GlobalData.appBaseUrl)
+//    .baseUrl(UrlConfig.DEVICE_BASE_URL)
+    .client(HttpManager.instance.client)
+    .addConverterFactory(GsonConverterFactory.create())
+    .build()
+    .create(ApiService::class.java)
+
+//val apiService2: ApiService2 = Retrofit.Builder()
+//    .baseUrl(UrlConfig.BASE_URL)
+////    .baseUrl(UrlConfig.DEVICE_BASE_URL)
+//    .client(HttpManager.instance.client)
+//    .addConverterFactory(GsonConverterFactory.create())
+//    .build()
+//    .create(ApiService2::class.java)
+
+class HttpManager private constructor() {
+    val client: OkHttpClient by lazy {
         OkHttpClient.Builder()
             .apply {
                 connectTimeout(15, TimeUnit.SECONDS)
@@ -22,40 +40,32 @@ class HttpClient private constructor() {
                 writeTimeout(15, TimeUnit.SECONDS)
                 sslSocketFactory(createSSLSocketFactory(), TrustAllCerts())
                 hostnameVerifier { _, _ -> true }
-                //if (BuildConfig.Debug) {
+                addNetworkInterceptor(HttpLoggingInterceptor(logger = {
-                    addInterceptor(LoggingInterceptor())
+                    Log.d("HttpManager", "okhttp logger ==>${it}")
-               //   }
+                }).also {
+                    it.level = HttpLoggingInterceptor.Level.BODY
+                })
+                addInterceptor(RequestInterceptor())
+//                addInterceptor(ExceptionInterceptor())
             }
             .build()
     }
 
     companion object {
-        val instance by lazy { HttpClient() }
+        val instance by lazy { HttpManager() }
-    }
-
-    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) {}
+        override fun checkClientTrusted(chain: Array<X509Certificate>, authType: String) {
+        }
+
         @SuppressLint("TrustAllX509TrustManager")
-        override fun checkServerTrusted(chain: Array<X509Certificate>, authType: String) {}
+        override fun checkServerTrusted(chain: Array<X509Certificate>, authType: String) {
+        }
+
         override fun getAcceptedIssuers(): Array<X509Certificate> = arrayOf()
     }
 

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

@@ -0,0 +1,488 @@
+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.model.CookFoodDTO
+import com.shuwei.dish.match.model.CookOrderCompositionItem
+import com.shuwei.dish.match.model.CookOrderMealGroup
+import com.shuwei.dish.match.model.CookOrderPageRequest
+import com.shuwei.dish.match.model.FoodRecord
+import com.shuwei.dish.match.model.GoodsItem
+import com.shuwei.dish.match.model.GoodsNameQueryDTO
+import com.shuwei.dish.match.model.ConstituteSaveRequest
+import com.shuwei.dish.match.model.CookCompleteRequest
+import com.shuwei.dish.match.model.FoodCompositionResponse
+import com.shuwei.dish.match.model.FoodSearchItem
+import com.shuwei.dish.match.model.FoodSearchRequest
+import com.shuwei.dish.match.model.MakeHistoryChartRow
+import com.shuwei.dish.match.model.MakeHistoryItem
+import com.shuwei.dish.match.model.MakeHistoryRequest
+import com.shuwei.dish.match.model.MaterSearchItem
+import com.shuwei.dish.match.model.MaterSearchRequest
+import com.shuwei.dish.match.model.SampleHistoryItem
+import com.shuwei.dish.match.model.SampleHistoryRequest
+import com.shuwei.dish.match.model.SeasoningSearchItem
+import com.shuwei.dish.match.model.SeasoningSearchRequest
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.launch
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.MultipartBody
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import java.io.File
+
+/**
+ * 网络请求 ViewModel，所有网络操作通过 RemoteRepository 发起，不直接依赖 apiService
+ * @param repository 网络数据仓库，默认使用单例实例
+ */
+class NetViewModel(
+    private val repository: RemoteRepository = RemoteRepository()
+) : ViewModel() {
+
+    /**
+     * 提交制作菜品的 UI 状态流，UI 层通过 collect 监听
+     */
+    private val _submitCookFoodState = MutableStateFlow<UiState<Any?>>(UiState.Idle)
+    val submitCookFoodState: StateFlow<UiState<Any?>> = _submitCookFoodState.asStateFlow()
+
+    /**
+     * 提交制作菜品
+     */
+    fun submitCookFood(entity: CookFoodDTO) {
+        viewModelScope.launch {
+            _submitCookFoodState.value = UiState.Loading
+            _submitCookFoodState.value = repository.submitCookFood(entity)
+        }
+    }
+
+    /**
+     * 查询菜品详情的 UI 状态流，UI 层通过 collect 监听
+     */
+    private val _foodDetailState = MutableStateFlow<UiState<CookFoodDTO?>>(UiState.Idle)
+    val foodDetailState: StateFlow<UiState<CookFoodDTO?>> = _foodDetailState.asStateFlow()
+
+    /**
+     * 查询菜品详情
+     */
+    fun getFoodDetail(foodId: String) {
+        viewModelScope.launch {
+            _foodDetailState.value = UiState.Loading
+            _foodDetailState.value = repository.getFoodDetail(foodId)
+        }
+    }
+
+    fun resetFoodDetailState() {
+        _foodDetailState.value = UiState.Idle
+    }
+
+    /**
+     * 查询菜品食材构成的 UI 状态流（新配比秤接口），UI 层通过 collect 监听
+     */
+    private val _cookOrderCompositionState = MutableStateFlow<UiState<List<CookOrderCompositionItem>?>>(UiState.Idle)
+    val cookOrderCompositionState: StateFlow<UiState<List<CookOrderCompositionItem>?>> = _cookOrderCompositionState.asStateFlow()
+
+    /**
+     * 查询菜品食材构成（新配比秤接口，仅返回主材+辅材）
+     * @param cookOrderId 烹制单 ID
+     */
+    fun getCookOrderComposition(cookOrderId: String) {
+        viewModelScope.launch {
+            _cookOrderCompositionState.value = UiState.Loading
+            _cookOrderCompositionState.value = repository.getCookOrderComposition(cookOrderId)
+        }
+    }
+
+    /**
+     * 搜索菜品列表的 UI 状态流。
+     * 使用 replay=1 保证 Fragment 重建后能收到最近一次结果；
+     * emit 时包一层 Event wrapper 打破 equals 去重，确保相同数据也能触发 collect。
+     */
+    private val _searchFoodState = MutableSharedFlow<UiState<MutableList<FoodRecord>?>>(
+        replay = 1,
+        extraBufferCapacity = 1
+    )
+    val searchFoodState: SharedFlow<UiState<MutableList<FoodRecord>?>> = _searchFoodState.asSharedFlow()
+
+    /**
+     * 搜索菜品列表
+     */
+    fun searchFoodList(param: MutableMap<String, Any>) {
+        viewModelScope.launch {
+            // pageNum=1 时先 emit Idle 重置 replay 缓存，防止相同数据导致 SharedFlow 去重不触发
+            if (param["pageNum"] == 1) {
+                _searchFoodState.emit(UiState.Idle)
+            }
+            _searchFoodState.emit(UiState.Loading)
+            _searchFoodState.emit(repository.searchFoodList(param))
+        }
+    }
+
+    /**
+     * 搜索菜品列表（回调版本），结果通过 onResult 直接回调，不经过 StateFlow/SharedFlow
+     * 适合需要每次都能触发的场景（下拉刷新、上拉加载更多）
+     */
+    fun searchFoodListWithCallback(
+        param: MutableMap<String, Any>,
+        onLoading: () -> Unit = {},
+        onResult: (UiState<MutableList<FoodRecord>?>) -> Unit
+    ) {
+        viewModelScope.launch {
+            onLoading()
+            onResult(repository.searchFoodList(param))
+        }
+    }
+
+    /**
+     * 当日烹饪任务列表的 UI 状态流（新配比秤接口），UI 层通过 collect 监听
+     * 使用 SharedFlow(replay=1) 保证 Fragment 重建后收到最近一次结果
+     */
+    private val _cookOrderPageState = MutableSharedFlow<UiState<List<CookOrderMealGroup>?>>(
+        replay = 1,
+        extraBufferCapacity = 1
+    )
+    val cookOrderPageState: SharedFlow<UiState<List<CookOrderMealGroup>?>> = _cookOrderPageState.asSharedFlow()
+
+    /**
+     * 查询当日烹饪任务列表（新配比秤接口，StateFlow 版本）
+     * 适合 FoodSearchActivity 等通过 collect 监听结果的场景
+     */
+    fun getCookOrderPage(request: CookOrderPageRequest) {
+        viewModelScope.launch {
+            _cookOrderPageState.emit(UiState.Loading)
+            _cookOrderPageState.emit(repository.getCookOrderPage(request))
+        }
+    }
+
+    /**
+     * 查询当日烹饪任务列表（新配比秤接口，回调版本）
+     * 适合 FoodListFragment 下拉刷新、Tab 切换等需要每次都能触发的场景
+     */
+    fun getCookOrderPageWithCallback(
+        request: CookOrderPageRequest,
+        onLoading: () -> Unit = {},
+        onResult: (UiState<List<CookOrderMealGroup>?>) -> Unit
+    ) {
+        viewModelScope.launch {
+            onLoading()
+            onResult(repository.getCookOrderPage(request))
+        }
+    }
+
+    /**
+     */
+    private val _samplingListState = MutableStateFlow<UiState<MutableList<FoodRecord>?>>(UiState.Idle)
+    val samplingListState: StateFlow<UiState<MutableList<FoodRecord>?>> = _samplingListState.asStateFlow()
+    fun resetSamplingListState() {
+        _samplingListState.value = UiState.Idle
+    }
+
+    /**
+     * 查询采样数据列表
+     */
+    fun getSamplingList(param: MutableMap<String, Any>) {
+        viewModelScope.launch {
+            _samplingListState.value = UiState.Loading
+            _samplingListState.value = repository.getSamplingList(param)
+        }
+    }
+
+    /**
+     * 查询采样数据列表（回调版本），结果通过 onResult 直接回调，不经过 StateFlow
+     * 适合不需要跨生命周期持续监听的一次性查询场景
+     */
+    fun getSamplingListWithCallback(
+        param: MutableMap<String, Any>,
+        onLoading: () -> Unit = {},
+        onResult: (UiState<MutableList<FoodRecord>?>) -> Unit
+    ) {
+        viewModelScope.launch {
+            onLoading()
+            onResult(repository.getSamplingList(param))
+        }
+    }
+
+    /**
+     * 查询物品信息列表的 UI 状态流（食材/调料共用），UI 层通过 collect 监听
+     */
+    private val _goodsListState = MutableStateFlow<UiState<MutableList<GoodsItem>?>>(UiState.Idle)
+    val goodsListState: StateFlow<UiState<MutableList<GoodsItem>?>> = _goodsListState.asStateFlow()
+
+    /**
+     * 食材搜索弹窗专用的 UI 状态流，与 goodsListState 隔离，避免弹窗请求影响其他页面
+     */
+    private val _foodSearchGoodsListState = MutableStateFlow<UiState<MutableList<GoodsItem>?>>(UiState.Idle)
+    val foodSearchGoodsListState: StateFlow<UiState<MutableList<GoodsItem>?>> = _foodSearchGoodsListState.asStateFlow()
+
+    fun resetGoodsListState() {
+        _goodsListState.value = UiState.Idle
+    }
+
+    /**
+     * 查询物品信息列表（食材 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(
+        goodsType: String,
+        placeId: String = BaseApp.canteenId,
+        pageNum: Int = 1,
+        pageSize: Int = 50,
+        goodsName: String? = null,
+        goodsNames: List<GoodsNameQueryDTO>? = 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 {
+            _goodsListState.value = UiState.Loading
+            _goodsListState.value = repository.queryGoodsList(param)
+        }
+    }
+
+    /**
+     * 食材搜索弹窗专用的查询方法，结果写入 foodSearchGoodsListState，不影响 goodsListState
+     * @param goodsType 物品类型：0=食材，1=调料
+     * @param placeId 场所 ID，默认取当前食堂 ID
+     * @param pageNum 页码，默认第 1 页
+     * @param pageSize 每页条数，默认 50
+     * @param goodsName 按名称模糊搜索，为 null 时不传该字段
+     * @param goodsNames 按名称+净材种类列表批量查询，为 null 时不传该字段
+     */
+    fun queryFoodSearchGoodsList(
+        goodsType: String,
+        placeId: String = BaseApp.canteenId,
+        pageNum: Int = 1,
+        pageSize: Int = 50,
+        goodsName: String? = null,
+        goodsNames: List<GoodsNameQueryDTO>? = 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 {
+            _foodSearchGoodsListState.value = UiState.Loading
+            _foodSearchGoodsListState.value = repository.queryGoodsList(param)
+        }
+    }
+
+    /**
+     * 调料模糊搜索（新配比秤接口，回调版本）
+     * 替代旧 queryGoodsList(goodsType=1) 调用
+     * @param keyword 模糊匹配食材名称和别名，为 null 时不传该字段
+     * @param pageNum 页码，默认第 1 页
+     * @param pageSize 每页条数，默认 50
+     * @param onLoading 请求发起前的回调
+     * @param onResult 结果回调，直接接收 UiState<List<SeasoningSearchItem>?>
+     */
+    fun querySeasoningSearch(
+        keyword: String? = null,
+        pageNum: Int = 1,
+        pageSize: Int = 50,
+        onLoading: () -> Unit = {},
+        onResult: (UiState<List<SeasoningSearchItem>?>) -> Unit
+    ) {
+        viewModelScope.launch {
+            onLoading()
+            onResult(repository.getSeasoningSearch(
+                SeasoningSearchRequest(keyword = keyword, pageNum = pageNum, pageSize = pageSize)
+            ))
+        }
+    }
+
+    /**
+     * 烹饪完成（新配比秤接口，回调版本），替代旧 submitCookFood
+     * 仅在制作模式下 cookOrderId 可用的场景调用
+     */
+    fun cookOrderComplete(
+        request: CookCompleteRequest,
+        onLoading: () -> Unit = {},
+        onResult: (UiState<Any?>) -> Unit
+    ) {
+        viewModelScope.launch {
+            onLoading()
+            onResult(repository.cookOrderComplete(request))
+        }
+    }
+
+    /**
+     * 食材模糊搜索（回调版本）
+     * @param keyword 模糊匹配食材名称和别名，为 null 时不传该字段
+     * @param pageNum 页码，默认第 1 页
+     * @param pageSize 每页条数，默认 20
+     */
+    fun materSearch(
+        keyword: String? = null,
+        pageNum: Int = 1,
+        pageSize: Int = 20,
+        onLoading: () -> Unit = {},
+        onResult: (UiState<MutableList<MaterSearchItem>?>) -> Unit
+    ) {
+        viewModelScope.launch {
+            onLoading()
+            onResult(repository.materSearch(
+                MaterSearchRequest(keyword = keyword, pageNum = pageNum, pageSize = pageSize)
+            ))
+        }
+    }
+
+    /**
+     * 搜菜品（回调版本，制作模式选已有上架菜品）
+     */
+    fun foodSearch(
+        keyword: String? = null,
+        pageNum: Int = 1,
+        pageSize: Int = 20,
+        onLoading: () -> Unit = {},
+        onResult: (UiState<MutableList<FoodSearchItem>?>) -> Unit
+    ) {
+        viewModelScope.launch {
+            onLoading()
+            onResult(repository.foodSearch(
+                FoodSearchRequest(keyword = keyword, pageNum = pageNum, pageSize = pageSize)
+            ))
+        }
+    }
+
+    /**
+     * 查菜品构成（回调版本，制作模式）
+     */
+    fun getFoodComposition(
+        foodId: String,
+        onLoading: () -> Unit = {},
+        onResult: (UiState<FoodCompositionResponse?>) -> Unit
+    ) {
+        viewModelScope.launch {
+            onLoading()
+            onResult(repository.getFoodComposition(foodId))
+        }
+    }
+
+    /**
+     * 提交采样（回调版本，落库味养创新实验，制作模式已废弃本接口）
+     */
+    fun constituteSave(
+        request: ConstituteSaveRequest,
+        onLoading: () -> Unit = {},
+        onResult: (UiState<Any?>) -> Unit
+    ) {
+        viewModelScope.launch {
+            onLoading()
+            onResult(repository.constituteSave(request))
+        }
+    }
+
+    /**
+     * 已提交采样列表（回调版本，本食堂 source=2，不分日期）
+     * @param pageNum 页码，默认第 1 页
+     * @param pageSize 每页条数，默认 10
+     */
+    fun sampleHistory(
+        pageNum: Int = 1,
+        pageSize: Int = 10,
+        onLoading: () -> Unit = {},
+        onResult: (UiState<MutableList<SampleHistoryItem>?>) -> Unit
+    ) {
+        viewModelScope.launch {
+            onLoading()
+            onResult(repository.sampleHistory(
+                SampleHistoryRequest(
+                    pageNum = pageNum,
+                    pageSize = pageSize
+                )
+            ))
+        }
+    }
+
+    /**
+     * 制作历史（回调版本，本设备按日期可选过滤）
+     */
+    fun makeHistory(
+        pageNum: Int = 1,
+        pageSize: Int = 10,
+        day: String? = null,
+        onLoading: () -> Unit = {},
+        onResult: (UiState<MutableList<MakeHistoryItem>?>) -> Unit
+    ) {
+        viewModelScope.launch {
+            onLoading()
+            onResult(repository.makeHistory(
+                MakeHistoryRequest(pageNum = pageNum, pageSize = pageSize, day = day)
+            ))
+        }
+    }
+
+    /**
+     * 制作历史图表（回调版本，按菜品id）
+     */
+    fun makeHistoryChart(
+        foodId: String,
+        onLoading: () -> Unit = {},
+        onResult: (UiState<MutableList<MakeHistoryChartRow>?>) -> Unit
+    ) {
+        viewModelScope.launch {
+            onLoading()
+            onResult(repository.makeHistoryChart(foodId))
+        }
+    }
+
+    /**
+     * 上传采集菜品信息 UI 状态流，UI 层通过 collect 监听
+     */
+    private val _uploadCollectState = MutableStateFlow<UiState<List<String>?>>(UiState.Idle)
+    val uploadCollectState: StateFlow<UiState<List<String>?>> = _uploadCollectState.asStateFlow()
+
+    /**
+     * 上传采集菜品信息（触发 StateFlow，适合单次上传场景）
+     */
+    fun uploadFoodVectorData(
+        fileList: List<File>,
+        params: MutableMap<String, RequestBody>
+    ) {
+        val fileParts = fileList.map { file ->
+            file.asRequestBody("multipart/form-data".toMediaTypeOrNull())
+                .let { MultipartBody.Part.createFormData("foodPics", file.name, it) }
+        }
+        viewModelScope.launch {
+            _uploadCollectState.value = UiState.Loading
+            _uploadCollectState.value = repository.uploadFoodVectorData(params, fileParts)
+        }
+    }
+
+    /**
+     * 上传采集菜品信息（直接返回结果，适合分批循环上传场景）
+     * @param fileList 图片文件列表
+     * @param params 附加参数
+     * @return UiState 包装的结果
+     */
+    suspend fun uploadFoodVectorDataBatch(
+        fileList: List<File>,
+        params: MutableMap<String, RequestBody>
+    ): UiState<List<String>?> {
+        val fileParts = fileList.map { file ->
+            //multipart/form-data  image/jpeg
+            file.asRequestBody("multipart/form-data".toMediaTypeOrNull())
+                .let { MultipartBody.Part.createFormData("foodPics", file.name, it) }
+        }
+        return repository.uploadFoodVectorData(params, fileParts)
+    }
+}

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

@@ -0,0 +1,114 @@
+package com.shuwei.dish.match.net
+
+import com.shuwei.dish.match.model.CookFoodDTO
+import com.shuwei.dish.match.model.CookOrderCompositionItem
+import com.shuwei.dish.match.model.CookOrderMealGroup
+import com.shuwei.dish.match.model.CookOrderPageRequest
+import com.shuwei.dish.match.model.FoodRecord
+import com.shuwei.dish.match.model.GoodsItem
+import com.shuwei.dish.match.model.ConstituteSaveRequest
+import com.shuwei.dish.match.model.CookCompleteRequest
+import com.shuwei.dish.match.model.FoodCompositionResponse
+import com.shuwei.dish.match.model.FoodSearchItem
+import com.shuwei.dish.match.model.FoodSearchRequest
+import com.shuwei.dish.match.model.MakeHistoryChartRow
+import com.shuwei.dish.match.model.MakeHistoryItem
+import com.shuwei.dish.match.model.MakeHistoryRequest
+import com.shuwei.dish.match.model.MaterSearchItem
+import com.shuwei.dish.match.model.MaterSearchRequest
+import com.shuwei.dish.match.model.SampleHistoryItem
+import com.shuwei.dish.match.model.SampleHistoryRequest
+import com.shuwei.dish.match.model.SeasoningSearchItem
+import com.shuwei.dish.match.model.SeasoningSearchRequest
+import okhttp3.MultipartBody
+import okhttp3.RequestBody
+
+/**
+ * 网络数据仓库，封装所有 ApiService 调用
+ * ViewModel 不直接接触 apiService，统一通过此类发起网络请求
+ */
+class RemoteRepository {
+
+    /** 统一封装 API 调用：处理响应映射和异常转换，返回 UiState */
+    private suspend fun <T> safeApiCall(call: suspend () -> ApiResponse<T>): UiState<T?> {
+        return try {
+            val resp = call()
+            if (resp.isSuccess()) UiState.Success(resp.data)
+            else UiState.Error(resp.code, resp.msg ?: "")
+        } catch (e: Exception) {
+            UiState.Error("-1", getApiException(e).errorMsg)
+        }
+    }
+
+    /** 提交制作菜品 */
+    suspend fun submitCookFood(entity: CookFoodDTO): UiState<Any?> =
+        safeApiCall { apiService.submitCookFood(param = entity) }
+
+    /** 查询菜品详情 */
+    suspend fun getFoodDetail(foodId: String): UiState<CookFoodDTO?> =
+        safeApiCall { apiService.getFoodDetail(foodId = foodId) }
+
+    /** 查询当日烹饪任务列表（按餐次分组），新配比秤接口 */
+    suspend fun getCookOrderPage(request: CookOrderPageRequest): UiState<List<CookOrderMealGroup>?> =
+        safeApiCall { apiService.getCookOrderPage(request = request) }
+
+    /** 查询菜品食材构成（主材+辅材），新配比秤接口 */
+    suspend fun getCookOrderComposition(cookOrderId: String): UiState<List<CookOrderCompositionItem>?> =
+        safeApiCall { apiService.getCookOrderComposition(cookOrderId = cookOrderId) }
+
+    /** 搜索菜品列表 */
+    suspend fun searchFoodList(param: MutableMap<String, Any>): UiState<MutableList<FoodRecord>?> =
+        safeApiCall { apiService.searchFoodList(param = param) }
+
+    /** 查询采样数据列表 */
+    suspend fun getSamplingList(param: MutableMap<String, Any>): UiState<MutableList<FoodRecord>?> =
+        safeApiCall { apiService.getSamplingList(param = param) }
+
+    /** 查询物品信息列表（食材 goodsType=0，调料 goodsType=1 共用） */
+    suspend fun queryGoodsList(param: MutableMap<String, Any>): UiState<MutableList<GoodsItem>?> =
+        safeApiCall { apiService.queryGoodsList(param = param) }
+
+    /** 调料模糊搜索，新配比秤接口 */
+    suspend fun getSeasoningSearch(request: SeasoningSearchRequest): UiState<List<SeasoningSearchItem>?> =
+        safeApiCall { apiService.getSeasoningSearch(request = request) }
+
+    /** 烹饪完成，新配比秤接口，替代旧 submitCookFood */
+    suspend fun cookOrderComplete(request: CookCompleteRequest): UiState<Any?> =
+        safeApiCall { apiService.cookOrderComplete(request = request) }
+
+    /** 食材模糊搜索 */
+    suspend fun materSearch(request: MaterSearchRequest): UiState<MutableList<MaterSearchItem>?> =
+        safeApiCall { apiService.materSearch(request = request) }
+
+    /** 搜菜品（制作模式选已有上架菜品） */
+    suspend fun foodSearch(request: FoodSearchRequest): UiState<MutableList<FoodSearchItem>?> =
+        safeApiCall { apiService.foodSearch(request = request) }
+
+    /** 查菜品构成（制作模式） */
+    suspend fun getFoodComposition(foodId: String): UiState<FoodCompositionResponse?> =
+        safeApiCall { apiService.getFoodComposition(foodId = foodId) }
+
+    /** 提交采样（落库味养创新实验，制作模式已废弃本接口） */
+    suspend fun constituteSave(request: ConstituteSaveRequest): UiState<Any?> =
+        safeApiCall { apiService.constituteSave(request = request) }
+
+    /** 已提交采样列表（本食堂 source=2，按提交时间倒序，不分日期） */
+    suspend fun sampleHistory(request: SampleHistoryRequest): UiState<MutableList<SampleHistoryItem>?> =
+        safeApiCall { apiService.sampleHistory(request = request) }
+
+    /** 制作历史（本设备，按日期可选过滤） */
+    suspend fun makeHistory(request: MakeHistoryRequest): UiState<MutableList<MakeHistoryItem>?> =
+        safeApiCall { apiService.makeHistory(request = request) }
+
+    /** 制作历史图表（按菜品id） */
+    suspend fun makeHistoryChart(foodId: String): UiState<MutableList<MakeHistoryChartRow>?> =
+        safeApiCall { apiService.makeHistoryChart(foodId = foodId) }
+
+    /** 上传采集数据 */
+    suspend fun uploadFoodVectorData(
+        params: MutableMap<String, RequestBody>,
+        foodPics: List<MultipartBody.Part>
+    ): UiState<List<String>?> =
+        safeApiCall { apiService.uploadFoodVectorData(params = params, foodPics = foodPics) }
+
+}

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

@@ -0,0 +1,23 @@
+package com.shuwei.dish.match.net
+
+import com.shuwei.dish.match.base.GlobalData
+import okhttp3.Interceptor
+import okhttp3.Response
+
+/**
+ * 请求拦截器
+ */
+class RequestInterceptor : Interceptor {
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val originalRequest = chain.request()
+        val requestBuilder = originalRequest.newBuilder()
+            .header("X-Access-Token", "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJjYW50ZWVuSWQiOiJiZTE1NDgzMS0zNDY2LTNiYTItYTJlYS01NzY1MmM5MTlmZWQiLCJ0eXBlIjoiNCIsInVzZXJJZCI6IjAwMDAwMDAwMDAwMDAwMDAwMDEifQ.sN40cOC-O5WQFrF4IDUs8fFlkNdUKLbJt_rHyTsgYYM")
+            .header("X-DEVICE-CODE", GlobalData.deviceId)
+            .header("X-DEVICE-TOKEN", GlobalData.deviceId)
+            .header("authorization", "57ee87183f2a4fa59683ec9ef41c8f5d")
+
+        val newRequest = requestBuilder.build()
+
+        return chain.proceed(newRequest)
+    }
+}

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

@@ -0,0 +1,12 @@
+package com.shuwei.dish.match.net
+
+data class ApiResponse<T>(
+    val code: String,
+    val msg: String? = "",
+    val data: T? = null,
+    /** 分页总条数，仅新配比秤接口返回（如 seasoning-search），旧接口为 null */
+    val total: Int? = null
+) {
+    /** 兼容旧接口成功码 "00000" 和新配比秤接口成功码 "200" */
+    fun isSuccess() = code == "00000" || code == "200"
+}

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,41 @@
+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,
+    var version: String? = 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
+        if (version != other.version) 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)
+        result = 31 * result + (version?.hashCode() ?: 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,319 @@
+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: 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 = 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? {
+        // 模型未初始化时直接返回 null，避免 UninitializedPropertyAccessException
+        if (!::module.isInitialized) {
+            logInfo("bitmap2FloatArray: module 尚未初始化，跳过推理")
+            return null
+        }
+        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.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 ?: ""
+            val arr = name.split("&&")
+            var rawMaterialsType = ""
+            if (arr.size > 1) {
+                rawMaterialsType = arr[1]
+            }
+            nameScoreList.add(IdNameScore(id = it.id, name = arr[0], score = it.score, rawMaterialsType = rawMaterialsType))
+        }
+        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,
+        val rawMaterialsType: String
+    )
+
+    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,332 @@
+/*
+ * 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()
+    }
+
+    // 清除所有向量采集数据
+    suspend fun removeAll() = safeDbOp {
+        getBox<Food>()?.removeAll()
+    }
+
+    /**
+     * 按名称分组统计采集数量
+     * 使用属性查询只加载 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
+    }
+
+}