From f3d57177b8745ed350971abe8ff690807a3acad5 Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Thu, 23 Apr 2026 17:41:26 +0800
Subject: [PATCH] =?UTF-8?q?feat(activity):=20=E5=88=B6=E4=BD=9C/=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=8C=89=E9=92=AE=E5=A2=9E=E5=8A=A0=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=BC=B9=E7=AA=97=EF=BC=8C=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=A0=87=E9=A2=98=E9=A2=9C=E8=89=B2=E5=8F=8A?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B9=E8=83=8C=E6=99=AF=E5=B1=9E=E6=80=A7?=
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>
---
 .../dish/match/ui/SubmitFoodActivity.kt       | 34 +++++++++++++++++--
 app/src/main/res/layout/dialog_common.xml     |  2 +-
 .../res/layout/list_item_collected_food.xml   |  2 +-
 3 files changed, 33 insertions(+), 5 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 cfb1a62..75cb2d2 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
@@ -1,7 +1,11 @@
 package com.shuwei.dish.match.ui
 
 import android.annotation.SuppressLint
+import android.graphics.Color
+import android.graphics.Typeface
 import android.os.Bundle
+import android.text.style.ForegroundColorSpan
+import android.text.style.StyleSpan
 import android.util.Log
 import androidx.activity.addCallback
 import androidx.lifecycle.Lifecycle
@@ -24,6 +28,8 @@ import com.shuwei.dish.match.scale.ScaleDeviceConfig
 import com.shuwei.dish.match.scale.ScaleServiceManager
 import com.shuwei.dish.match.utils.AddressUtil
 import com.shuwei.dish.match.utils.WeightUtil
+import com.shuwei.dish.match.utils.ext.appendText
+import com.shuwei.dish.match.utils.ext.buildSpannableString
 import com.shuwei.dish.match.utils.ext.clickWithDebounce
 import com.shuwei.dish.match.utils.ext.gone
 import com.shuwei.dish.match.utils.ext.roundedDecimalPlace
@@ -139,6 +145,7 @@ class SubmitFoodActivity : BaseActivity() {
                             toast(state.msg)
                             dismissLoading()
                         }
+
                         else -> {}
                     }
                 }
@@ -256,14 +263,18 @@ class SubmitFoodActivity : BaseActivity() {
     }
 
     private fun addViewListener() {
-        binding.btnCook.clickWithDebounce { cook() }
+        binding.btnCook.clickWithDebounce {
+            val content = getRemindSpannable("开始制作")
+            showRemindDialog(content) { cook() }
+        }
         binding.btnWeightClear.clickWithDebounce { WeightUtil.tareTwo(2) }
         binding.btnSubmit.clickWithDebounce {
             if (cookFoodEntity.foodWeight <= 0.toDouble()) {
                 toast("未识别到菜品熟重")
                 return@clickWithDebounce
             }
-            submit()
+            val content = getRemindSpannable("制作完成")
+            showRemindDialog(content) { submit() }
         }
 
         // 监听主设备 2格秤的熟重
@@ -402,7 +413,6 @@ class SubmitFoodActivity : BaseActivity() {
     }
 
 
-
     override fun onDestroy() {
         WeightUtil.removeWeightListener(TAG)
         super.onDestroy()
@@ -421,4 +431,22 @@ class SubmitFoodActivity : BaseActivity() {
             .show()
     }
 
+    /**
+     * 点击制作和提交按钮确认dialog
+     */
+    private fun showRemindDialog(content: CharSequence, action: () -> Unit) {
+        CommonDialog(this)
+            .setTitle("温馨提示")
+            .setContent(content)
+            .setNegativeButton("取消")
+            .setPositiveButton("确认") { action() }
+            .show()
+    }
+
+    private fun getRemindSpannable(cookStateText: String) = buildSpannableString {
+        appendText("请确认是否 ")
+        appendText(cookStateText, StyleSpan(Typeface.BOLD), ForegroundColorSpan(Color.BLACK))
+        appendText(" ？")
+    }
+
 }
diff --git a/app/src/main/res/layout/dialog_common.xml b/app/src/main/res/layout/dialog_common.xml
index 266be35..1ec15cd 100644
--- a/app/src/main/res/layout/dialog_common.xml
+++ b/app/src/main/res/layout/dialog_common.xml
@@ -15,7 +15,7 @@
         android:layout_marginTop="55dp"
         android:layout_marginEnd="40dp"
         android:gravity="center"
-        android:textColor="@color/black"
+        android:textColor="@color/black333"
         android:textSize="36sp"
         android:textStyle="bold" />
 
diff --git a/app/src/main/res/layout/list_item_collected_food.xml b/app/src/main/res/layout/list_item_collected_food.xml
index 00e0ba1..cbf4fc6 100644
--- a/app/src/main/res/layout/list_item_collected_food.xml
+++ b/app/src/main/res/layout/list_item_collected_food.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/white"
+    tools:background="@color/white"
     android:orientation="vertical">
 
     <LinearLayout