From 858cc24046559aa9328231d3b4510d6706b0a872 Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Thu, 30 Apr 2026 10:55:46 +0800
Subject: [PATCH] =?UTF-8?q?fix(activity):=20=E4=BC=98=E5=8C=96=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E9=A1=B5=E8=BF=94=E5=9B=9E=E6=9C=AA=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=B8=8E=E9=87=87=E6=A0=B7=E9=A1=B5=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../shuwei/dish/match/ui/SubmitFoodActivity.kt | 18 +++++++++++++++++-
 .../main/res/layout/activity_sampling_mode.xml |  3 ++-
 2 files changed, 19 insertions(+), 2 deletions(-)

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 @@
         </com.scwang.smart.refresh.layout.SmartRefreshLayout>
     </LinearLayout>
 
-    <androidx.appcompat.widget.AppCompatButton
+    <TextView
         android:id="@+id/btnAddSampling"
         android:layout_width="match_parent"
         android:layout_height="90dp"
         android:layout_margin="30dp"
         android:background="@drawable/shape_green_bg"
+        android:foreground="?android:attr/selectableItemBackground"
         android:gravity="center"
         android:text="@string/add_sampling"
         android:textColor="@color/white"