|
@@ -212,20 +212,23 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
|
|
|
isRefresh = false
|
|
|
if (viewModel.isSearch) {
|
|
|
if (!viewModel.loadMoreForSearch()) {
|
|
|
- finishLoadMore(0)
|
|
|
- }
|
|
|
- }
|
|
|
- if (viewModel.recipesType == RecipesType.ONLINE) {
|
|
|
- if (viewModel.currentPage < viewModel.totalPageSize) {
|
|
|
- viewModel.getOnLineRecipeList(
|
|
|
- categoryCode, viewModel.currCategoryName, isLoadMore = true
|
|
|
- )
|
|
|
- } else {
|
|
|
- finishLoadMore(true)
|
|
|
+ finishLoadMoreWithNoMoreData()
|
|
|
}
|
|
|
} else {
|
|
|
- if (viewModel.loadMoreLocalRecipes()) {
|
|
|
- closeHeaderOrFooter()
|
|
|
+ if (viewModel.recipesType == RecipesType.ONLINE) {
|
|
|
+ if (viewModel.currentPage < viewModel.totalPageSize) {
|
|
|
+ viewModel.getOnLineRecipeList(
|
|
|
+ categoryCode, viewModel.currCategoryName, isLoadMore = true
|
|
|
+ )
|
|
|
+ } else {
|
|
|
+ finishLoadMoreWithNoMoreData()
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ if (!viewModel.loadMoreLocalRecipes()) {
|
|
|
+ finishLoadMoreWithNoMoreData()
|
|
|
+ } else {
|
|
|
+ closeHeaderOrFooter()
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -399,7 +402,7 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
|
|
|
//获取对应分类菜谱回调
|
|
|
localRecipesLiveData.observe(viewLifecycleOwner) {
|
|
|
binding.page.apply {
|
|
|
- if (isRefresh){
|
|
|
+ if (isRefresh) {
|
|
|
finishRefresh()
|
|
|
} else {
|
|
|
finishLoadMore(true)
|
|
@@ -417,7 +420,7 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
|
|
|
//获取线上菜谱列表回调
|
|
|
onLineRecipesLiveData.observe(viewLifecycleOwner) {
|
|
|
binding.page.apply {
|
|
|
- if (isRefresh){
|
|
|
+ if (isRefresh) {
|
|
|
finishRefresh()
|
|
|
} else {
|
|
|
finishLoadMore(true)
|
|
@@ -454,7 +457,7 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
|
|
|
//搜索回调
|
|
|
hotWordSearchRecipesLiveData.observe(viewLifecycleOwner) {
|
|
|
binding.page.apply {
|
|
|
- if (isRefresh){
|
|
|
+ if (isRefresh) {
|
|
|
finishRefresh()
|
|
|
} else {
|
|
|
finishLoadMore(true)
|