支付完成倒计时3秒返回首页；秤默认置零取消，打开直接识别物品；人脸识别图片显示拉伸优化；设置页面切换是否收费模式首页逻辑处理；

2025-12-18 18:25:15 +08:00
parent 1d0e1a62e2
commit ab3109f36a
26 changed files with 540 additions and 258 deletions
@@ -28,10 +28,10 @@ object UserNutritionUtils {
        var (calorie, grain, fruitsVegetables, meatEggs) = List(4) { 0.0 }

        // 处理食物信息
-        calorie = calculateValue(foodInfo.calorie, weight)
-        grain = calculateValue(foodInfo.stapleFood, weight)
-        fruitsVegetables = calculateValue(foodInfo.fruitsVegetables, weight)
-        meatEggs = calculateValue(foodInfo.meatEggs, weight)
+        calorie = foodInfo.calorie ?: 0.0 //calculateValue(foodInfo.calorie, weight)
+        grain = foodInfo.stapleFood ?: 0.0 //calculateValue(foodInfo.stapleFood, weight)
+        fruitsVegetables = foodInfo.fruitsVegetables ?: 0.0 //calculateValue(foodInfo.fruitsVegetables, weight)
+        meatEggs = foodInfo.meatEggs ?: 0.0 //calculateValue(foodInfo.meatEggs, weight)

        // 合并用户数据
        //val maxKcal = (nutrition.calorie?:0.0) * calculateDinnerTypeRatio(dinnerType) / 10.0