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 55e4a2e2e..e3ccd0692 100644 --- a/app/src/main/java/io/legado/app/model/ReadBook.kt +++ b/app/src/main/java/io/legado/app/model/ReadBook.kt @@ -56,7 +56,6 @@ object ReadBook : CoroutineScope by MainScope() { var book: Book? = null var callBack: CallBack? = null var inBookshelf = false - var tocChanged = false var chapterSize = 0 var simulatedChapterSize = 0 var durChapterIndex = 0 @@ -925,9 +924,10 @@ object ReadBook : CoroutineScope by MainScope() { if (simulatedChapterSize > 0 && durChapterIndex > simulatedChapterSize - 1) { durChapterIndex = simulatedChapterSize - 1 } - clearTextChapter() - if (callBack != null) { - loadContent(false) + if (callBack == null) { + clearTextChapter() + } else { + loadContent(true) } } } 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 699c1d504..24ec87846 100644 --- a/app/src/main/java/io/legado/app/model/ReadManga.kt +++ b/app/src/main/java/io/legado/app/model/ReadManga.kt @@ -44,7 +44,6 @@ import kotlin.math.min @Suppress("MemberVisibilityCanBePrivate") object ReadManga : CoroutineScope by MainScope() { var inBookshelf = false - var tocChanged = false var book: Book? = null val executor = globalExecutor var durChapterIndex = 0 //章节位置 @@ -546,8 +545,9 @@ object ReadManga : CoroutineScope by MainScope() { if (simulatedChapterSize > 0 && durChapterIndex > simulatedChapterSize - 1) { durChapterIndex = simulatedChapterSize - 1 } - clearMangaChapter() - if (mCallback != null) { + if (mCallback == null) { + clearMangaChapter() + } else { loadContent() } } diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt index 0f3d4f17f..68c938a12 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt @@ -176,7 +176,6 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) { execute { if (loadChapterListAwait(book)) { ReadBook.upMsg(null) - ReadBook.loadContent(resetPageOffset = true) } } } diff --git a/app/src/main/java/io/legado/app/ui/book/toc/TocActivity.kt b/app/src/main/java/io/legado/app/ui/book/toc/TocActivity.kt index b101c8abc..9cd64f516 100644 --- a/app/src/main/java/io/legado/app/ui/book/toc/TocActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/TocActivity.kt @@ -198,7 +198,6 @@ class TocActivity : VMBaseActivity(), ReadBook.book?.let { readBook -> if (readBook == book) { ReadBook.upMsg(null) - ReadBook.loadContent(resetPageOffset = true) } } }