From 8106ca0bc095dce8c658358f876ae447d80d4a86 Mon Sep 17 00:00:00 2001
From: Horis <8674809+821938089@users.noreply.github.com>
Date: Fri, 7 Mar 2025 17:38:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/io/legado/app/model/ReadManga.kt   |  2 +-
 .../io/legado/app/ui/book/manga/ReadMangaActivity.kt | 12 ++++++++----
 .../app/ui/book/manga/entities/MangaContentData.kt   |  3 ++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/io/legado/app/model/ReadManga.kt b/app/src/main/java/io/legado/app/model/ReadManga.kt
index 6754db996..5fa902ec0 100644
--- a/app/src/main/java/io/legado/app/model/ReadManga.kt
+++ b/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)
     }
 
     /**
diff --git a/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt b/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt
index d4e43e20f..5242ff9ef 100644
--- a/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt
+++ b/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()
                     }
                 }
             }
diff --git a/app/src/main/java/io/legado/app/ui/book/manga/entities/MangaContentData.kt b/app/src/main/java/io/legado/app/ui/book/manga/entities/MangaContentData.kt
index 02c8ccc72..3f49be706 100644
--- a/app/src/main/java/io/legado/app/ui/book/manga/entities/MangaContentData.kt
+++ b/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
 )