联合支付功能测试

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

@@ -1220,18 +1220,21 @@ class MainScreenPresentation(
                     isMember = false
                     //ToastUtils.showToast("isKeepFaceState=$isKeepFaceState,mealPickupMode=$mealPickupMode")
                     //|| isKeepFaceState
-                    if (activity.settlementMode == 0) {
-                        activity.isAnalyzing = false
-                        step1FoodRecognizing()
-                    } else {
+//                    if (activity.settlementMode == 0) {
+//                        activity.isAnalyzing = false
+//                        step1FoodRecognizing()
+//                    } else {
                         if (mealPickupMode == 1) {
                             step2FaceRecognizing(currentFood!!)
                             isKeepFaceState = false
+                            if (activity.settlementMode == 0) {
+                                setTopInfoVisible()
+                            }
                         } else {
                             activity.isAnalyzing = false
                             step1FoodRecognizing()
                         }
-                    }
+//                    }
                 })
             }
         }
@@ -1263,11 +1266,15 @@ class MainScreenPresentation(
         //    foodWeight = lastWeight
         //)
         //userViewModel.postUserNutritionData(listOf(userNutritionParam))
+        val realWeight = eatWeight.toDouble()
+        val specWeight = currentFood!!.specWeight
+        val eatNum = activity.getEatNum(realWeight, specWeight)
+        activity.log("createOrder,realWeight=$realWeight,specWeight=$specWeight")
         activity.createOrder(
             foodInfo = currentFood!!,
             foodWeight = lastWeight,
             eatWeight = eatWeight,
-            eatNum = activity.getEatNum(eatWeight.toDouble(), currentFood!!.specWeight),
+            eatNum = eatNum,
             userId = currentUserId,
             isMember = isMember,
             notEnoughOneBlock = notEnoughOneBlock,