From 45562a9fc1007c94e5abe93bc2318a6db1ca7661 Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Tue, 14 Apr 2026 15:19:09 +0800
Subject: [PATCH] =?UTF-8?q?fix(order):=20=E8=A7=A3=E5=86=B3=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=94=9F=E6=88=90=E5=90=8E=E9=A4=90=E5=93=81=E6=9C=AA?=
 =?UTF-8?q?=E6=8B=BF=E8=B5=B0=E7=9A=84=E6=A3=80=E6=B5=8B=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加abs函数导入用于计算重量绝对值
- 在订单生成成功后增加重量检测逻辑
- 当称重绝对值大于10克时认为餐品未被拿走
- 添加详细的调试日志记录重量信息
- 集成FileUtil工具类用于保存操作日志
- 在人脸数据获取流程中添加日志记录时间戳变化
---
 .../sw/dualscreen/presentation/MainScreenPresentation.kt  | 8 ++++++++
 .../java/com/sw/dualscreen/viewmodel/UserViewModel.kt     | 4 ++++
 2 files changed, 12 insertions(+)

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 a163ecc..3a3ad90 100644
--- a/app/src/main/java/com/sw/dualscreen/presentation/MainScreenPresentation.kt
+++ b/app/src/main/java/com/sw/dualscreen/presentation/MainScreenPresentation.kt
@@ -65,6 +65,7 @@ import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import java.text.DecimalFormat
+import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.roundToInt
 
@@ -1340,6 +1341,13 @@ class MainScreenPresentation(
                             setTopInfoVisible()
                         }
                     } else {
+                        Timber.tag(TAG).d("drawPreviewInfo,successBlock,订单已生成,称重为：${activity.currentWeight}")
+                        //即放即取未拿走餐品，不用重置为默认识别中状态
+                        if (abs(activity.currentWeight) > 10) {
+                            //提交订单后秤重量绝对值大于10克，都认为餐品还没拿走
+                            Timber.tag(TAG).d("drawPreviewInfo,successBlock,订单已生成,未拿走餐品")
+                            return@createOrder
+                        }
                         Timber.tag(TAG).d("drawPreviewInfo,successBlock,订单已生成,step1FoodRecognizing")
                         Timber.tag(TAG).e("切回step1,------2000000000002")
                         activity.isAnalyzing = false
diff --git a/app/src/main/java/com/sw/dualscreen/viewmodel/UserViewModel.kt b/app/src/main/java/com/sw/dualscreen/viewmodel/UserViewModel.kt
index 938bce0..541ccce 100644
--- a/app/src/main/java/com/sw/dualscreen/viewmodel/UserViewModel.kt
+++ b/app/src/main/java/com/sw/dualscreen/viewmodel/UserViewModel.kt
@@ -18,6 +18,7 @@ import com.sw.dualscreen.model.response.UserFaceModel2
 import com.sw.dualscreen.model.response.UserNutrition
 import com.sw.dualscreen.objbox.CollectedFoodInfo
 import com.sw.dualscreen.utils.Debouncer
+import com.sw.dualscreen.utils.FileUtil
 import com.sw.dualscreen.utils.SPUtil
 import com.sw.dualscreen.utils.SpTool
 import com.sw.plate.App
@@ -107,6 +108,7 @@ class UserViewModel : BaseViewModel() {
             _loadFaceResult.value = false
             //获取全量数据时，时间戳改为0
             SpTool.lastFaceTimestamp = 0
+            FileUtil.saveLog("获取人脸全量数据开始，重置时间戳为0")
             val response = repository.getUserFaceCache(currentPageNo)
             val check = parseResponse(response)
             if (!check) {
@@ -144,6 +146,7 @@ class UserViewModel : BaseViewModel() {
                     lastFaceTimestamp = list.last().faceUpdateTimestamp ?: 0L
                 }
                 SpTool.lastFaceTimestamp = lastFaceTimestamp
+                FileUtil.saveLog("获取人脸[全量]数据结束，时间戳为:$lastFaceTimestamp")
                 _loadFaceResult.value = true
                 onSuccess()
             }
@@ -221,6 +224,7 @@ class UserViewModel : BaseViewModel() {
                         lastFaceTimestamp = list.last().faceUpdateTimestamp ?: 0L
                     }
                     SpTool.lastFaceTimestamp = lastFaceTimestamp
+                    FileUtil.saveLog("获取人脸[增量]数据结束，时间戳为:$lastFaceTimestamp")
                     onAllQueryFinished()
                 }
             }