From dde0bbc4d5bbb13800faa23bfa9c0c54d13f7248 Mon Sep 17 00:00:00 2001
From: mazengfei <331023091@qq.com>
Date: Fri, 10 Apr 2026 17:48:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BD=99=E9=87=8F=E8=AE=A1?=
 =?UTF-8?q?=E9=87=8F=E6=A8=A1=E5=BC=8F=E4=B8=8B=E6=8B=BF=E5=AE=8C=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E6=95=B0=E6=8D=AE=E6=97=B6=E6=80=BB=E9=87=8D=E9=87=8F?=
 =?UTF-8?q?=E4=B8=8D=E5=AF=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/sw/dualscreen/activity/MainActivity.kt    | 6 +++++-
 .../sw/dualscreen/presentation/MainScreenPresentation.kt    | 4 +++-
 2 files changed, 8 insertions(+), 2 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 366a1a0..67d713b 100644
--- a/app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt
+++ b/app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt
@@ -356,8 +356,12 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
         log("registerDataChange weight 联合支付-余量计量")
         if (weight <= WEIGHT_RESET_RECOGNIZE) {
             log("registerDataChange weight 联合支付-余量计量，重量小于${WEIGHT_RESET_RECOGNIZE}g,step1FoodRecognizing")
-            if (presentation?.currentUserId.isNullOrBlank().not()) {
+            if (presentation?.currentUserId.isNullOrBlank().not() && presentation!!.jointPaymentQueryFinish) {
                 //联合支付+余量计量，已识别人脸的状态下，从秤上拿餐品后，不再读取数据，等待人脸离开提交订单
+                if (lastWeight != weight) {
+                    presentation?.updateWeight(weight)
+                    lastWeight = weight
+                }
                 return
             }
             //秤上重量过小，显示识别中页面
diff --git a/app/src/main/java/com/sw/dualscreen/presentation/MainScreenPresentation.kt b/app/src/main/java/com/sw/dualscreen/presentation/MainScreenPresentation.kt
index 82939ce..a163ecc 100644
--- a/app/src/main/java/com/sw/dualscreen/presentation/MainScreenPresentation.kt
+++ b/app/src/main/java/com/sw/dualscreen/presentation/MainScreenPresentation.kt
@@ -185,7 +185,9 @@ class MainScreenPresentation(
                 calculateNutrition(weight)
             } else {
                 //余量计量
-                calculateNutrition(recognitionWeight - weight)
+                val value = recognitionWeight - weight
+                Timber.tag(TAG).e("updateWeight 余量计量：${recognitionWeight} - ${weight} = ${value}")
+                calculateNutrition(value)
             }
         }
         lastWeight = weight