From 39ee51dbddc63ff7e2b009714ccaec460799b8e0 Mon Sep 17 00:00:00 2001
From: Horis <821938089@qq.com>
Date: Sat, 24 Feb 2024 12:34:21 +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/ReadBook.kt   | 13 +++++--------
 .../io/legado/app/ui/book/read/ReadBookActivity.kt  |  4 ----
 .../io/legado/app/ui/book/read/page/ReadView.kt     |  4 ----
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/io/legado/app/model/ReadBook.kt b/app/src/main/java/io/legado/app/model/ReadBook.kt
index 9c648dd5b..9f202faf3 100644
--- a/app/src/main/java/io/legado/app/model/ReadBook.kt
+++ b/app/src/main/java/io/legado/app/model/ReadBook.kt
@@ -90,7 +90,9 @@ object ReadBook : CoroutineScope by MainScope() {
         readRecord.readTime = appDb.readRecordDao.getReadTime(book.name) ?: 0
         chapterSize = appDb.bookChapterDao.getChapterCount(book.bookUrl)
         contentProcessor = ContentProcessor.get(book)
-        durChapterIndex = min(book.durChapterIndex, chapterSize - 1)
+        if (chapterSize > 0) {
+            durChapterIndex = min(book.durChapterIndex, chapterSize - 1)
+        }
         durChapterPos = book.durChapterPos
         isLocalBook = book.isLocal
         clearTextChapter()
@@ -533,20 +535,17 @@ object ReadBook : CoroutineScope by MainScope() {
                 0 -> {
                     curTextChapter?.cancelLayout()
                     curTextChapter = textChapter
-                    if (resetPageOffset) {
-                        callBack?.resetPageOffset()
-                    }
                     callBack?.upMenuView()
                     textChapter.setProgressListener(object : LayoutProgressListener {
                         var available = false
 
                         override fun onLayoutPageCompleted(index: Int, page: TextPage) {
                             if (!available && page.containPos(durChapterPos)) {
-                                curPageChanged()
-                                callBack?.contentLoadFinish()
                                 if (upContent) {
                                     callBack?.upContent(offset, resetPageOffset)
                                 }
+                                curPageChanged()
+                                callBack?.contentLoadFinish()
                                 available = true
                             }
                             if (upContent && isScroll) {
@@ -742,8 +741,6 @@ object ReadBook : CoroutineScope by MainScope() {
         fun upPageAnim()
 
         fun notifyBookChanged()
-
-        fun resetPageOffset()
     }
 
 }
diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
index 1be4a9460..79665a87f 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
@@ -1375,10 +1375,6 @@ class ReadBookActivity : BaseReadBookActivity(),
         binding.readView.onLayoutPageCompleted(index, page)
     }
 
-    override fun resetPageOffset() {
-        binding.readView.resetPageOffset()
-    }
-
     /* 全文搜索跳转 */
     private fun skipToSearch(searchResult: SearchResult) {
         val previousResult = binding.searchMenu.previousSearchResult
diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/ReadView.kt b/app/src/main/java/io/legado/app/ui/book/read/page/ReadView.kt
index bd7e12b7e..6173b9265 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/page/ReadView.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/page/ReadView.kt
@@ -669,10 +669,6 @@ class ReadView(context: Context, attrs: AttributeSet) :
         upProgressThrottle.invoke()
     }
 
-    fun resetPageOffset() {
-        curPage.resetPageOffset()
-    }
-
     override val currentChapter: TextChapter?
         get() {
             return if (callBack.isInitFinish) ReadBook.textChapter(0) else null