From d7f9fb05fb6ba41dac48aaa6bda61c06f96da796 Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Mon, 18 May 2026 11:49:57 +0800
Subject: [PATCH] =?UTF-8?q?fix(food):=20=E4=BF=AE=E5=A4=8D=E8=8F=9C?=
 =?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=E5=88=B7=E6=96=B0=E5=92=8C=E5=87=80?=
 =?UTF-8?q?=E6=9D=90=E5=AF=B9=E8=AF=9D=E6=A1=86=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 Fragment 初始化时启用下拉刷新功能
- 将数据加载逻辑移至 onResume 方法中并添加异常处理
- 添加 onHiddenChanged 回调以在 Fragment 显示时重新加载数据
- 更新净材对话框为空时的提示文本和按钮样式
---
 .../match/ui/fragment/FoodListFragment.kt     | 23 +++++++++++++++----
 .../match/utils/RawMaterialsDialogUtils.kt    |  4 ++--
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/shuwei/dish/match/ui/fragment/FoodListFragment.kt b/app/src/main/java/com/shuwei/dish/match/ui/fragment/FoodListFragment.kt
index 3103959..e4e99ec 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/fragment/FoodListFragment.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/fragment/FoodListFragment.kt
@@ -133,13 +133,19 @@ class FoodListFragment : BaseFragment<FragmentFoodListBinding>() {
             adapter = dishAdapter
         }
         addViewListener()
-
-        pageNo = 1
-        activity.showLoading()
-        getDishList()
         binding.refreshLayout.setEnableRefresh(true)
     }
 
+    override fun onResume() {
+        super.onResume()
+        runCatching {
+            pageNo = 1
+            getDishList()
+        }.onFailure {
+            it.printStackTrace()
+        }
+    }
+
     /**
      * 构建统一样式的删除菜单项
      */
@@ -167,6 +173,15 @@ class FoodListFragment : BaseFragment<FragmentFoodListBinding>() {
         }
     }
 
+    override fun onHiddenChanged(hidden: Boolean) {
+        super.onHiddenChanged(hidden)
+        if (!hidden) {
+            Log.d("FoodList", "显示")
+            pageNo = 1
+            getDishList()
+        }
+    }
+
     fun getDishList(pageNo: Int, dinnerType: String, foodName: String? = null) {
         this.pageNo = pageNo
         this.dinnerType = dinnerType
diff --git a/app/src/main/java/com/shuwei/dish/match/utils/RawMaterialsDialogUtils.kt b/app/src/main/java/com/shuwei/dish/match/utils/RawMaterialsDialogUtils.kt
index 04edc0e..f21ae23 100644
--- a/app/src/main/java/com/shuwei/dish/match/utils/RawMaterialsDialogUtils.kt
+++ b/app/src/main/java/com/shuwei/dish/match/utils/RawMaterialsDialogUtils.kt
@@ -66,8 +66,8 @@ fun showRawMaterialsDialog(
 
     if (typeList.isEmpty()) {
         // 无净材数据时仅展示提示文字
-        dialog.setContent("无净材数据")
-            .setPositiveButton("确认") {}
+        dialog.setContent("暂无净材种类，联系管理员添加")
+            .setSingleButton("确认") {}
     } else {
         // 构建单选 ChipGroup 作为自定义内容
         val chipGroup = buildSingleChoiceChipGroup(context, typeList, checkedType)