From cc2fd2d743a18c0dd5f678188160de2ca739f7d9 Mon Sep 17 00:00:00 2001
From: mazengfei <331023091@qq.com>
Date: Thu, 6 Nov 2025 14:18:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=93=81=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/sw/dualscreen/activity/MainActivity.kt  | 7 ++++---
 .../presentation/SecondaryScreenPresentation.kt           | 8 +++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt b/app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt
index 57e5663..34693c5 100644
--- a/app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt
+++ b/app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt
@@ -210,9 +210,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
             Timber.d("registerDataChange weight = $weight")
             presentation?.updateWeight(weight)
 
-//            if (weight <= 0.005) {//检测到秤上没有东西，重新启动识别菜品
-//                isRecognitionFood = true
-//            }
+            if (weight <= 0.005 && presentation?.mealPickupMode == 1) {//余量取餐，检测到秤上没有东西，重新启动识别菜品
+                isRecognitionFood = true
+            }
+
             if (weight - lastWeight > 0.05 && isRecognitionFood) { // 大于50g
                 if (presentation?.mealPickupMode == 1) {
                     isRecognitionFood = false
diff --git a/app/src/main/java/com/sw/dualscreen/presentation/SecondaryScreenPresentation.kt b/app/src/main/java/com/sw/dualscreen/presentation/SecondaryScreenPresentation.kt
index c70a005..2faacb1 100644
--- a/app/src/main/java/com/sw/dualscreen/presentation/SecondaryScreenPresentation.kt
+++ b/app/src/main/java/com/sw/dualscreen/presentation/SecondaryScreenPresentation.kt
@@ -797,12 +797,18 @@ class SecondaryScreenPresentation(
             Timber.d("postUserData userNutritionData = ${userNutritionData == null}, currentFood = ${currentFood == null}")
             return
         }
+        var eatWeight = 0.0
+        if (mealPickupMode == 0) {//即放即取
+            eatWeight = recognitionWeight - 0
+        } else {
+            eatWeight = recognitionWeight - lastWeight
+        }
         val userNutritionParam = UserNutritionParam(
             userId = userNutritionData?.userId!!,
             foodId = currentFood?.id!!,
             faceTime = recognitionTime,
             faceEndTime = System.currentTimeMillis(),
-            eatWeight = recognitionWeight - lastWeight,
+            eatWeight = eatWeight,//lastWeight
             foodWeight = lastWeight
         )
         viewModel.postUserNutritionData(listOf<UserNutritionParam>(userNutritionParam))