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 722d403..c1be40a 100644 --- a/app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt +++ b/app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt @@ -988,7 +988,7 @@ class MainActivity : BaseActivity() { params["foodVector"] = foodVectorJson.toRequestBody() val idList = viewModel.uploadCollectFoodPics(files, params) if (idList.isNullOrEmpty()) { - loadRemindDialog("未返回id") + loadRemindDialog("上传失败,未返回向量数据id") Timber.tag(TAG).d("idList为空") return } diff --git a/app/src/main/java/com/sw/dualscreen/activity/fragment/CollectFragment.kt b/app/src/main/java/com/sw/dualscreen/activity/fragment/CollectFragment.kt index bc5a84a..1c171f6 100644 --- a/app/src/main/java/com/sw/dualscreen/activity/fragment/CollectFragment.kt +++ b/app/src/main/java/com/sw/dualscreen/activity/fragment/CollectFragment.kt @@ -225,7 +225,8 @@ class CollectFragment : BaseFragment() { ToastUtils.showToast("请选择菜品名称") return@setOnClickListener } - if (foodCollectionList.size <= 1) { + val count = foodCollectionList.count { it.imageFile != null } + if (count == 0) { ToastUtils.showToast("请拍摄菜品照片") return@setOnClickListener } diff --git a/app/src/main/java/com/sw/dualscreen/presentation/UserNutritionUtils.kt b/app/src/main/java/com/sw/dualscreen/presentation/UserNutritionUtils.kt index bdc4ca4..bca172c 100644 --- a/app/src/main/java/com/sw/dualscreen/presentation/UserNutritionUtils.kt +++ b/app/src/main/java/com/sw/dualscreen/presentation/UserNutritionUtils.kt @@ -29,10 +29,10 @@ object UserNutritionUtils { // 处理食物信息 if (weight > 0.0) { - calorie = calculateValue2(foodInfo.calorie,foodInfo.specWeight, weight) - grain = calculateValue2(foodInfo.stapleFood, foodInfo.specWeight,weight) - fruitsVegetables = calculateValue2(foodInfo.fruitsVegetables, foodInfo.specWeight,weight) - meatEggs = calculateValue2(foodInfo.meatEggs, foodInfo.specWeight,weight) + calorie = calculateValue2(foodInfo.calorie,weight) + grain = calculateValue2(foodInfo.stapleFood, weight) + fruitsVegetables = calculateValue2(foodInfo.fruitsVegetables, weight) + meatEggs = calculateValue2(foodInfo.meatEggs, weight) } // 合并用户数据 @@ -142,9 +142,9 @@ object UserNutritionUtils { else -> 0 } } - private fun calculateValue2(nutrient: Double?, specWeight: Double?, weight: Double): Double { - if ((nutrient?:0.0) == 0.0 || (specWeight?:0.0) == 0.0) return 0.0 - return nutrient!! * weight / specWeight!! + private fun calculateValue2(nutrient: Double?, weight: Double): Double { + if ((nutrient?:0.0) == 0.0) return 0.0 + return nutrient!! * weight / 100.0 } /** * 计算每百克含量