From a4f3f9527cd2390db0a1a0a3d332dedd32164bf8 Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Thu, 5 Feb 2026 15:06:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dish/match/entity/CookFoodGoodsEntity.kt  |  4 ++++
 .../shuwei/dish/match/entity/FoodRecord.kt    |  3 ++-
 .../dish/match/ui/PrepareCookActivity.kt      | 24 ++++++++++++-------
 .../match/ui/fragment/DishListFragment.kt     |  2 ++
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/shuwei/dish/match/entity/CookFoodGoodsEntity.kt b/app/src/main/java/com/shuwei/dish/match/entity/CookFoodGoodsEntity.kt
index ed6e0d2..507a21c 100644
--- a/app/src/main/java/com/shuwei/dish/match/entity/CookFoodGoodsEntity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/entity/CookFoodGoodsEntity.kt
@@ -82,4 +82,8 @@ class CookFoodGoodsEntity(
 
     @Ignore
     var isClicked: Boolean = false
+
+    //true-原始数据，false-非原始数据
+    @Ignore
+    var isOriginalData: Boolean = true
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/shuwei/dish/match/entity/FoodRecord.kt b/app/src/main/java/com/shuwei/dish/match/entity/FoodRecord.kt
index b02bd09..2a0220f 100644
--- a/app/src/main/java/com/shuwei/dish/match/entity/FoodRecord.kt
+++ b/app/src/main/java/com/shuwei/dish/match/entity/FoodRecord.kt
@@ -13,7 +13,8 @@ data class FoodRecord(
     var cookMode: Int = 0,
     //1-早餐，2-午餐，3-晚餐
     var dinnerType: String = "0",
-
+    //true-原始数据，false-非原始数据
+    var isOriginalData: Boolean = true,
     var sort: Int = 0
 ) : Serializable
 
diff --git a/app/src/main/java/com/shuwei/dish/match/ui/PrepareCookActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/PrepareCookActivity.kt
index 3dddcd2..ec28906 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/PrepareCookActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/PrepareCookActivity.kt
@@ -121,6 +121,7 @@ class PrepareCookActivity : BaseActivity() {
         Log.d(TAG, "addViewClickListener->useRealWeight=$weight")
         clickItem.run {
             useWeight = weight
+            isOriginalData = false
             isSetFinished = true
             dishPartAdapter.notifyItemChanged(clickIndex)
         }
@@ -138,6 +139,7 @@ class PrepareCookActivity : BaseActivity() {
                 goodsName = item.goodsName
 //                    materialType =
                 isNewDishType = true
+                isOriginalData = false
             })
             onItemClick(list.size - 1)
             binding.rvDishPartList.smoothScrollToPosition(list.size - 1)
@@ -327,17 +329,23 @@ class PrepareCookActivity : BaseActivity() {
     @SuppressLint("GestureBackNavigation")
     @Deprecated("Deprecated in Java")
     override fun onBackPressed() {
-        if (list.size > firstReqSize) {
-            //说明有新增的食材
-            saveDataRemindDialog()
-            return
-        }
-        val filterResult = list.firstOrNull { (it.useWeight ?: 0.toDouble()) > 0.toDouble() }
-        if (filterResult != null) {
-            //说明有称重的数据
+        val count = list.count { !it.isOriginalData }
+        if (count > 0) {
+            //说明有新增或者设置重量
             saveDataRemindDialog()
             return
         }
+//        if (list.size > firstReqSize) {
+//            //说明有新增的食材
+//            saveDataRemindDialog()
+//            return
+//        }
+//        val filterResult = list.firstOrNull { (it.useWeight ?: 0.toDouble()) > 0.toDouble() }
+//        if (filterResult != null) {
+//            //说明有称重的数据
+//            saveDataRemindDialog()
+//            return
+//        }
         super.onBackPressed()
     }
 
diff --git a/app/src/main/java/com/shuwei/dish/match/ui/fragment/DishListFragment.kt b/app/src/main/java/com/shuwei/dish/match/ui/fragment/DishListFragment.kt
index c6a90b0..5718488 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/fragment/DishListFragment.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/fragment/DishListFragment.kt
@@ -221,6 +221,8 @@ class DishListFragment : BaseFragment<FragmentDishListBinding>() {
     @SuppressLint("NotifyDataSetChanged")
     private fun loadEmptyView() {
         try {
+            binding.refreshLayout.setEnableRefresh(true)
+            binding.refreshLayout.setEnableLoadMore(false)
             list.clear()
             dishAdapter.notifyDataSetChanged()
             if (emptyViewBinding == null) {