支付调试优化

app/src/main/java/com/sw/dualscreen/presentation/MainScreenPresentation.kt

@@ -31,12 +31,10 @@ import com.sw.dualscreen.ext.gone
 import com.sw.dualscreen.ext.load
 import com.sw.dualscreen.ext.maskName
 import com.sw.dualscreen.ext.visible
-import com.sw.dualscreen.model.request.UserNutritionParam
 import com.sw.dualscreen.model.response.DinnerType
 import com.sw.dualscreen.model.response.FoodInfo
 import com.sw.dualscreen.model.response.UserEnergy
 import com.sw.dualscreen.model.response.UserNutrition
-import com.sw.dualscreen.model.response.UserNutritionData
 import com.sw.dualscreen.utils.Debouncer
 import com.sw.dualscreen.utils.SPUtil
 import com.sw.dualscreen.viewmodel.UserViewModel
@@ -119,9 +117,16 @@ class MainScreenPresentation(
         lastWeight = weight * 1000 // 将千克转成克
         Timber.tag(TAG)
             .d("updateWeight lastWeight = $weight, currentStep = $currentStep, isGoStep1 = $isGoStep1")
-//        if (lastWeight <= 5) {
-//            activity.isAnalyzing = false
-//        }
+        mealPickupMode = SPUtil.getInstance().get(GlobalKey.KEY_PICKUP_MODE, 0) ?: 0
+        val chargeMode = SPUtil.getInstance().get(GlobalKey.KEY_CHARGE_MODE, 0)
+        if (mealPickupMode == 1 && chargeMode == 0) {
+            //余量计量+计费模式
+            recognitionWeight = lastWeight
+            if (weight > 5) {
+                //余量计量，有重量的情况下不回到重新识别状态
+                return
+            }
+        }
         if (currentStep == 2 && lastWeight <= 5 && isGoStep1) {
             //人脸识别过程中,秤上物品拿走
             isGoStep1 = false