修复在线列表翻页问题

lyswhut · Mar 26, 2023 · 8ed584c · 8ed584c
1 parent 5a7e0ff
commit 8ed584c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,12 @@ Project versioning adheres to [Semantic Versioning](http://semver.org/).
 Commit convention is based on [Conventional Commits](http://conventionalcommits.org).
 Change log format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## [1.0.1](https://github.com/lyswhut/lx-music-mobile/compare/v1.0.0...v1.0.1) - 2023-03-26
+
+### 修复
+
+- 修复在线列表翻页问题
+
 ## [1.0.0](https://github.com/lyswhut/lx-music-mobile/compare/v0.15.5...v1.0.0) - 2023-03-26
 
 从v1.0.0起，我们发布了一个独立版的[数据同步服务](https://github.com/lyswhut/lx-music-sync-server#readme)，如果你有服务器，可以将其部署到服务器上作为私人多端同步服务使用，详情看该项目说明

diff --git a/src/screens/Home/Views/Leaderboard/MusicList.tsx b/src/screens/Home/Views/Leaderboard/MusicList.tsx
@@ -34,7 +34,7 @@ export default forwardRef<MusicListType, {}>((props, ref) => {
           if (isUnmountedRef.current) return
           requestAnimationFrame(() => {
             listRef.current?.setList(result.list)
-            listRef.current?.setStatus(boardState.listDetailInfo.maxPage >= page ? 'end' : 'idle')
+            listRef.current?.setStatus(boardState.listDetailInfo.maxPage <= page ? 'end' : 'idle')
           })
         }).catch(() => {
           if (boardState.listDetailInfo.list.length && page == 1) clearListDetail()
@@ -64,7 +64,7 @@ export default forwardRef<MusicListType, {}>((props, ref) => {
       const result = setListDetail(listDetail, boardState.listDetailInfo.id, page)
       if (isUnmountedRef.current) return
       listRef.current?.setList(result.list)
-      listRef.current?.setStatus(boardState.listDetailInfo.maxPage >= page ? 'end' : 'idle')
+      listRef.current?.setStatus(boardState.listDetailInfo.maxPage <= page ? 'end' : 'idle')
     }).catch(() => {
       if (boardState.listDetailInfo.list.length && page == 1) clearListDetail()
       listRef.current?.setStatus('error')
@@ -77,7 +77,7 @@ export default forwardRef<MusicListType, {}>((props, ref) => {
       const result = setListDetail(listDetail, boardState.listDetailInfo.id, page)
       if (isUnmountedRef.current) return
       listRef.current?.setList(result.list)
-      listRef.current?.setStatus(boardState.listDetailInfo.maxPage >= page ? 'end' : 'idle')
+      listRef.current?.setStatus(boardState.listDetailInfo.maxPage <= page ? 'end' : 'idle')
     }).catch(() => {
       if (boardState.listDetailInfo.list.length && page == 1) clearListDetail()
       listRef.current?.setStatus('error')

diff --git a/src/screens/Home/Views/Search/MusicList.tsx b/src/screens/Home/Views/Search/MusicList.tsx
@@ -35,7 +35,7 @@ export default forwardRef<MusicListType, {}>((props, ref) => {
           if (isUnmountedRef.current) return
           requestAnimationFrame(() => {
             listRef.current?.setList(list, source == 'all')
-            listRef.current?.setStatus(searchMusicState.listInfos[searchMusicState.source]!.maxPage >= page ? 'end' : 'idle')
+            listRef.current?.setStatus(searchMusicState.listInfos[searchMusicState.source]!.maxPage <= page ? 'end' : 'idle')
           })
         }).catch(() => {
           listRef.current?.setStatus('error')
@@ -59,7 +59,7 @@ export default forwardRef<MusicListType, {}>((props, ref) => {
       // const result = setListInfo(listDetail, searchMusicState.listDetailInfo.id, page)
       if (isUnmountedRef.current) return
       listRef.current?.setList(list, searchInfoRef.current.source == 'all')
-      listRef.current?.setStatus(searchMusicState.listInfos[searchInfoRef.current.source]!.maxPage >= page ? 'end' : 'idle')
+      listRef.current?.setStatus(searchMusicState.listInfos[searchInfoRef.current.source]!.maxPage <= page ? 'end' : 'idle')
     }).catch(() => {
       listRef.current?.setStatus('error')
     })
@@ -72,7 +72,7 @@ export default forwardRef<MusicListType, {}>((props, ref) => {
       // const result = setListInfo(listDetail, searchMusicState.listDetailInfo.id, page)
       if (isUnmountedRef.current) return
       listRef.current?.setList(list, searchInfoRef.current.source == 'all')
-      listRef.current?.setStatus(info.maxPage >= page ? 'end' : 'idle')
+      listRef.current?.setStatus(info.maxPage <= page ? 'end' : 'idle')
     }).catch(() => {
       listRef.current?.setStatus('error')
     })

diff --git a/src/screens/Home/Views/SongList/List.tsx b/src/screens/Home/Views/SongList/List.tsx
@@ -29,7 +29,7 @@ export default forwardRef<ListType, {}>((props, ref) => {
           if (isUnmountedRef.current) return
           requestAnimationFrame(() => {
             listRef.current?.setList(result.list)
-            listRef.current?.setStatus(songlistState.listInfo.maxPage >= page ? 'end' : 'idle')
+            listRef.current?.setStatus(songlistState.listInfo.maxPage <= page ? 'end' : 'idle')
           })
         }).catch(() => {
           if (songlistState.listInfo.list.length && page == 1) clearList()
@@ -54,7 +54,7 @@ export default forwardRef<ListType, {}>((props, ref) => {
       const result = setList(info, songlistState.listInfo.tagId, songlistState.listInfo.sortId, page)
       if (isUnmountedRef.current) return
       listRef.current?.setList(result.list)
-      listRef.current?.setStatus(songlistState.listInfo.maxPage >= page ? 'end' : 'idle')
+      listRef.current?.setStatus(songlistState.listInfo.maxPage <= page ? 'end' : 'idle')
     }).catch(() => {
       if (songlistState.listInfo.list.length && page == 1) clearList()
       listRef.current?.setStatus('error')
@@ -67,7 +67,7 @@ export default forwardRef<ListType, {}>((props, ref) => {
       const result = setList(info, songlistState.listInfo.tagId, songlistState.listInfo.sortId, page)
       if (isUnmountedRef.current) return
       listRef.current?.setList(result.list)
-      listRef.current?.setStatus(songlistState.listInfo.maxPage >= page ? 'end' : 'idle')
+      listRef.current?.setStatus(songlistState.listInfo.maxPage <= page ? 'end' : 'idle')
     }).catch(() => {
       if (songlistState.listInfo.list.length && page == 1) clearList()
       listRef.current?.setStatus('error')

diff --git a/src/screens/SonglistDetail/MusicList.tsx b/src/screens/SonglistDetail/MusicList.tsx
@@ -52,7 +52,7 @@ export default forwardRef<MusicListType, MusicListProps>(({ componentId }, ref)
               imgUrl: songlistState.selectListInfo.img ?? listDetailInfo.info.img,
             })
             listRef.current?.setList(result.list)
-            listRef.current?.setStatus(songlistState.listDetailInfo.maxPage >= page ? 'end' : 'idle')
+            listRef.current?.setStatus(songlistState.listDetailInfo.maxPage <= page ? 'end' : 'idle')
           })
         }).catch(() => {
           if (songlistState.listDetailInfo.list.length && page == 1) clearListDetail()
@@ -82,7 +82,7 @@ export default forwardRef<MusicListType, MusicListProps>(({ componentId }, ref)
       const result = setListDetail(listDetail, songlistState.listDetailInfo.id, page)
       if (isUnmountedRef.current) return
       listRef.current?.setList(result.list)
-      listRef.current?.setStatus(songlistState.listDetailInfo.maxPage >= page ? 'end' : 'idle')
+      listRef.current?.setStatus(songlistState.listDetailInfo.maxPage <= page ? 'end' : 'idle')
     }).catch(() => {
       if (songlistState.listDetailInfo.list.length && page == 1) clearListDetail()
       listRef.current?.setStatus('error')
@@ -95,7 +95,7 @@ export default forwardRef<MusicListType, MusicListProps>(({ componentId }, ref)
       const result = setListDetail(listDetail, songlistState.listDetailInfo.id, page)
       if (isUnmountedRef.current) return
       listRef.current?.setList(result.list)
-      listRef.current?.setStatus(songlistState.listDetailInfo.maxPage >= page ? 'end' : 'idle')
+      listRef.current?.setStatus(songlistState.listDetailInfo.maxPage <= page ? 'end' : 'idle')
     }).catch(() => {
       if (songlistState.listDetailInfo.list.length && page == 1) clearListDetail()
       listRef.current?.setStatus('error')