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() { 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() { } } + 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)