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