diff --git a/app/src/main/java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt index d078063..75845b5 100644 --- a/app/src/main/java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt +++ b/app/src/main/java/com/shuwei/dish/match/ui/SubmitFoodActivity.kt @@ -414,13 +414,29 @@ class SubmitFoodActivity : BaseActivity() { super.onDestroy() } + /** + * 判断是否存在未保存的数据 + * isCooking=true 时检查是否有新增秤数据;isCooking=false 时检查是否有调料数据 + */ + private fun hasUnsavedData(): Boolean { + return if (food?.isCooking == true) { + rawWeightMap.isNotEmpty() + } else { + seasoningAdapter.items.isNotEmpty() + } + } + /** * 未保存数据提醒dialog */ private fun remindSaveDataDialog() { + if (!hasUnsavedData()) { + finish() + return + } CommonDialog(this) .setTitle("保存提示") - .setContent("可能存在未保存的数据,请确认?") + .setContent("存在未保存的数据,请确认?") .setNegativeButton("取消,留在页面") .setNeutralButton("返回上页,不保存") { finish() } .setPositiveButton("保存为烹饪中菜品") { cook() } diff --git a/app/src/main/res/layout/activity_sampling_mode.xml b/app/src/main/res/layout/activity_sampling_mode.xml index 465b267..2566d8f 100644 --- a/app/src/main/res/layout/activity_sampling_mode.xml +++ b/app/src/main/res/layout/activity_sampling_mode.xml @@ -90,12 +90,13 @@ -