Horis 1 год назад
Родитель
Сommit
2b94ed0605

+ 1 - 1
app/src/main/java/io/legado/app/model/ReadManga.kt

@@ -296,7 +296,7 @@ object ReadManga : CoroutineScope by MainScope() {
         nextMangaChapter?.let {
             list.addAll(it.contents)
         }
-        return MangaContentData(pos, list, curMangaChapter != null)
+        return MangaContentData(pos, list, curMangaChapter != null, nextMangaChapter != null)
     }
 
     /**

+ 8 - 4
app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt

@@ -261,9 +261,10 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
             val data = withContext(IO) { ReadManga.mangaContents }
             val pos = data.pos
             val list = data.contents
-            val finish = data.finish
+            val curFinish = data.curFinish
+            val nextFinish = data.nextFinish
             mAdapter.submitList(list) {
-                if (loadingViewVisible && finish) {
+                if (loadingViewVisible && curFinish) {
                     binding.infobar.isVisible = true
                     upInfoBar(
                         ReadManga.durChapterIndex,
@@ -277,10 +278,13 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
                     loadMoreView.visible()
                 }
 
-                if (finish) {
-                    loadMoreView.stopLoad()
+                if (curFinish) {
                     if (!ReadManga.hasNextChapter) {
                         loadMoreView.noMore("暂无章节了!")
+                    } else if (nextFinish) {
+                        loadMoreView.stopLoad()
+                    } else {
+                        loadMoreView.startLoad()
                     }
                 }
             }

+ 2 - 1
app/src/main/java/io/legado/app/ui/book/manga/entities/MangaContentData.kt

@@ -3,5 +3,6 @@ package io.legado.app.ui.book.manga.entities
 data class MangaContentData(
     val pos: Int,
     val contents: List<Any>,
-    val finish: Boolean
+    val curFinish: Boolean,
+    val nextFinish: Boolean
 )