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() } }