From 7add521040693497c3badabd1075f095f88a3c21 Mon Sep 17 00:00:00 2001 From: max Date: Thu, 27 Jun 2024 11:08:18 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E8=B0=83=E6=95=B4=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=A4=A7=E5=B0=8F=EF=BC=9A50?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/chwl/app/home/HomeMeViewModel.kt | 8 ++++---- app/src/main/java/com/chwl/app/home/HomeViewModel.kt | 4 ++-- .../chwl/app/home/fragment/HomeRoomCollectListFragment.kt | 5 +++-- .../chwl/app/home/fragment/HomeRoomHistoryListFragment.kt | 5 +++-- .../com/chwl/app/home/fragment/HomeTabRoomFragment.kt | 5 +++-- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/chwl/app/home/HomeMeViewModel.kt b/app/src/main/java/com/chwl/app/home/HomeMeViewModel.kt index 045271ceb..c760a4408 100644 --- a/app/src/main/java/com/chwl/app/home/HomeMeViewModel.kt +++ b/app/src/main/java/com/chwl/app/home/HomeMeViewModel.kt @@ -19,25 +19,25 @@ class HomeMeViewModel : BaseViewModel() { } } - fun getHomeHistoryList(pageNum: Int) { + fun getHomeHistoryList(pageNum: Int, pageSize: Int) { safeLaunch( onError = { historyRoomListLiveData.value = ListResult.failed(pageNum) }, block = { - val result = HomeModel.getHomeHistoryRoomList(pageNum, 20) + val result = HomeModel.getHomeHistoryRoomList(pageNum, pageSize) historyRoomListLiveData.value = ListResult.success(result, pageNum) } ) } - fun getHomeCollectList(pageNum: Int) { + fun getHomeCollectList(pageNum: Int, pageSize: Int) { safeLaunch( onError = { collectRoomListLiveData.value = ListResult.failed(pageNum) }, block = { - val result = HomeModel.getHomeMyCollectRoomList(pageNum, 20) + val result = HomeModel.getHomeMyCollectRoomList(pageNum, pageSize) collectRoomListLiveData.value = ListResult.success(result, pageNum) } ) diff --git a/app/src/main/java/com/chwl/app/home/HomeViewModel.kt b/app/src/main/java/com/chwl/app/home/HomeViewModel.kt index e1ed79532..daa5607b7 100644 --- a/app/src/main/java/com/chwl/app/home/HomeViewModel.kt +++ b/app/src/main/java/com/chwl/app/home/HomeViewModel.kt @@ -27,13 +27,13 @@ class HomeViewModel : BaseViewModel() { val homeTabLiveData: MutableLiveData> = MutableLiveData>() val homeRankListLiveData = MutableLiveData>>() - fun getTabRoomList(tabId: Int, pageNum: Int) { + fun getTabRoomList(tabId: Int, pageNum: Int, pageSize: Int) { safeLaunch( onError = { tabRoomListLiveData.value = ListResult.failed(pageNum) }, block = { - val result = HomeModel.getHomeTabHome(tabId, pageNum, 20) + val result = HomeModel.getHomeTabHome(tabId, pageNum, pageSize) tabRoomListLiveData.value = ListResult.success(result, pageNum) } ) diff --git a/app/src/main/java/com/chwl/app/home/fragment/HomeRoomCollectListFragment.kt b/app/src/main/java/com/chwl/app/home/fragment/HomeRoomCollectListFragment.kt index e1434fbfe..9175bb1c8 100644 --- a/app/src/main/java/com/chwl/app/home/fragment/HomeRoomCollectListFragment.kt +++ b/app/src/main/java/com/chwl/app/home/fragment/HomeRoomCollectListFragment.kt @@ -29,6 +29,7 @@ class HomeRoomCollectListFragment : BaseViewBindingFragment() - .setPageSize(20) + .setPageSize(pageSize) .setAdapter(adapter) .setRecyclerView(binding.mRecyclerRoom) .setEmptyView( @@ -90,7 +91,7 @@ class HomeRoomCollectListFragment : BaseViewBindingFragment() - .setPageSize(20) + .setPageSize(pageSize) .setAdapter(adapter) .setRecyclerView(binding.mRecyclerRoom) .setEmptyView( @@ -90,7 +91,7 @@ class HomeRoomHistoryListFragment : BaseViewBindingFragment( var autoRefreshOnVisible = false private var pageNum = 1 + private val pageSize = 50 private var tabId: Int? = null companion object { @@ -70,7 +71,7 @@ class HomeTabRoomFragment : BaseViewBindingFragment( } } rvDelegate = RVDelegate.Builder() - .setPageSize(20) + .setPageSize(pageSize) .setAdapter(adapter) .setRecyclerView(binding.mRecyclerRoom) .setEmptyView( @@ -102,7 +103,7 @@ class HomeTabRoomFragment : BaseViewBindingFragment( } else { pageNum++ } - homeViewModel.getTabRoomList(tabId ?: 0, pageNum) + homeViewModel.getTabRoomList(tabId ?: 0, pageNum, pageSize) } override fun onRefresh() {