From 82960b26a0cfdc3e1016f35ec196abb27ef7d508 Mon Sep 17 00:00:00 2001
From: mazengfei <331023091@qq.com>
Date: Fri, 22 May 2026 17:29:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A7=A4=E9=87=8D=E9=87=8F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C=E9=87=8F=E7=A8=8B=E6=BA=A2=E5=87=BA?=
 =?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0=E7=BA=A2=E8=89=B2=E8=83=8C=E6=99=AF?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/shuwei/dish/match/ui/DeviceConfigActivity.kt     | 9 +++++++++
 .../java/com/shuwei/dish/match/ui/PrepareCookActivity.kt | 2 +-
 .../java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt  | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/shuwei/dish/match/ui/DeviceConfigActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/DeviceConfigActivity.kt
index 62a4592..016b3c9 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/DeviceConfigActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/DeviceConfigActivity.kt
@@ -12,6 +12,8 @@ import android.util.SparseArray
 import android.widget.FrameLayout
 import androidx.core.graphics.toColorInt
 import androidx.core.view.forEach
+import androidx.core.content.ContextCompat
+import com.shuwei.dish.match.R
 import com.shuwei.dish.match.base.BaseActivity
 import com.shuwei.dish.match.db.entity.SeasoningEntity
 import com.shuwei.dish.match.utils.AddressUtil
@@ -129,6 +131,13 @@ class DeviceConfigActivity : BaseActivity() {
                 item?.let {
                     it.useWeight = weight
                     updateGridData(it)
+                    // 根据是否量程溢出切换格子背景色
+                    val frameLayout = binding.include.root.findViewWithTag<FrameLayout>(it.sort.toString())
+                    frameLayout?.background = if (state == WeightUtil.STATE_OVER_WEIGHT) {
+                        ContextCompat.getDrawable(this, R.drawable.shape_red_10_corners)
+                    } else {
+                        ContextCompat.getDrawable(this, R.drawable.selector_text_cell)
+                    }
                 }
                 Log.d(TAG, "addWeighListener: update-----------------------")
             })
diff --git a/app/src/main/java/com/shuwei/dish/match/ui/PrepareCookActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/PrepareCookActivity.kt
index 3f7c855..e7bb603 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/PrepareCookActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/PrepareCookActivity.kt
@@ -215,7 +215,7 @@ class PrepareCookActivity : BaseActivity() {
     }
 
     private fun loadDishDetail(detail: CookFoodDTO) {
-        val voList = detail.matchingConstituteInfoList
+        val voList = detail.foodConstituteList
         if (voList.isNullOrEmpty()) {
             return
         }
diff --git a/app/src/main/java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt
index ed0a55e..513e8b1 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt
@@ -98,7 +98,7 @@ class SubmitFoodActivity : BaseActivity() {
     }
 
     private fun loadSeasoningFromLocal() {
-        appViewModel.getCookFoodGoodsList(foodId = food!!.foodId!!, cookMode = food!!.cookMode) { it ->
+        appViewModel.getCookFoodGoodsList(foodId = food!!.foodId!!, cookMode = food!!.cookMode, dinnerType = food!!.dinnerType) { it ->
             goodsList = mutableListOf()
             val goodsIdList = mutableListOf<String>()
             //设置主辅材数据