收藏夹列表分页加载

storytellerF · Jun 7, 2023 · c9a4640 · c9a4640
1 parent e68e1b7
commit c9a4640
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/app/src/main/java/com/a10miaomiao/bilimiao/page/user/UserFollowFragment.kt b/app/src/main/java/com/a10miaomiao/bilimiao/page/user/UserFollowFragment.kt
@@ -163,7 +163,7 @@ class UserFollowFragment : Fragment(), DIAware, MyPage {
             _leftPadding = contentInsets.left
             _rightPadding = contentInsets.right
             _topPadding = contentInsets.top
-            _bottomPadding = contentInsets.bottom
+            _bottomPadding = contentInsets.bottom + windowStore.bottomAppBarHeight
 
             views {
                 +view<WebView>(ID_webView) {

diff --git a/app/src/main/java/com/a10miaomiao/bilimiao/page/user/favourite/UserFavouriteListViewModel.kt b/app/src/main/java/com/a10miaomiao/bilimiao/page/user/favourite/UserFavouriteListViewModel.kt
@@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.a10miaomiao.bilimiao.MainNavGraph
 import com.a10miaomiao.bilimiao.comm.MiaoBindingUi
+import com.a10miaomiao.bilimiao.comm.entity.ListAndCountInfo
 import com.a10miaomiao.bilimiao.comm.entity.ResultInfo
 import com.a10miaomiao.bilimiao.comm.entity.comm.PaginationInfo
 import com.a10miaomiao.bilimiao.comm.entity.media.MediaListInfo
@@ -46,18 +47,20 @@ class UserFavouriteListViewModel(
             ui.setState {
                 list.loading = true
             }
-            val res = BiliApiService.userApi.favFolderList(id).awaitCall()
-                .gson<ResultInfo<UserSpaceFavFolderInfo>>()
+            val res = BiliApiService.userApi.favFolderList(
+                id,
+                pageNum = pageNum,
+                pageSize = list.pageSize
+            ).awaitCall().gson<ResultInfo<ListAndCountInfo<MediaListInfo>>>()
             if (res.code == 0) {
                 val result = res.data
-                val defaultFolderDetail = result.default_folder.folder_detail
-                val media0 = result.space_infos[0]
                 ui.setState {
-                    list.finished = true
-                    list.data.add(defaultFolderDetail)
-                    if (media0 != null) {
-                        list.data.addAll(media0.mediaListResponse.list)
+                    if (pageNum == 1) {
+                        list.data = result.list.toMutableList()
+                    } else {
+                        list.data.addAll(result.list)
                     }
+                    list.finished = !result.has_more
                 }
                 list.pageNum = pageNum
             } else {

diff --git a/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/apis/UserApi.kt b/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/apis/UserApi.kt
@@ -93,10 +93,15 @@ class UserApi {
 
     fun favFolderList(
         up_mid: String,
+        pageNum: Int,
+        pageSize: Int,
     ) = MiaoHttp.request {
+        // 用户空间 x/v3/fav/folder/space/v2
         url = BiliApiService.biliApi(
-            "x/v3/fav/folder/space/v2",
-            "up_mid" to up_mid
+            "x/v3/fav/folder/created/list",
+            "up_mid" to up_mid,
+            "pn" to pageNum.toString(),
+            "ps" to pageSize.toString(),
         )
     }
 

diff --git a/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/ListAndCountInfo.kt b/bilimiao-comm/src/main/java/com/a10miaomiao/bilimiao/comm/entity/ListAndCountInfo.kt
@@ -0,0 +1,7 @@
+package com.a10miaomiao.bilimiao.comm.entity
+
+data class ListAndCountInfo<T> (
+    val count: Int,
+    val list: List<T>,
+    val has_more: Boolean,
+)