This commit is contained in:
Horis
2024-02-22 17:15:55 +08:00
parent 3fb015c99f
commit 8637d0ee1f
3 changed files with 2 additions and 3 deletions
@@ -216,7 +216,6 @@ object ReadBook : CoroutineScope by MainScope() {
durChapterPos = 0 durChapterPos = 0
durChapterIndex++ durChapterIndex++
prevTextChapter?.cancelLayout() prevTextChapter?.cancelLayout()
curTextChapter?.setProgressListener(null)
prevTextChapter = curTextChapter prevTextChapter = curTextChapter
curTextChapter = nextTextChapter curTextChapter = nextTextChapter
nextTextChapter = null nextTextChapter = null
@@ -250,7 +249,6 @@ object ReadBook : CoroutineScope by MainScope() {
durChapterPos = if (toLast) prevTextChapter?.lastReadLength ?: Int.MAX_VALUE else 0 durChapterPos = if (toLast) prevTextChapter?.lastReadLength ?: Int.MAX_VALUE else 0
durChapterIndex-- durChapterIndex--
nextTextChapter?.cancelLayout() nextTextChapter?.cancelLayout()
curTextChapter?.setProgressListener(null)
nextTextChapter = curTextChapter nextTextChapter = curTextChapter
curTextChapter = prevTextChapter curTextChapter = prevTextChapter
prevTextChapter = null prevTextChapter = null
@@ -493,7 +491,6 @@ object ReadBook : CoroutineScope by MainScope() {
when (val offset = chapter.index - durChapterIndex) { when (val offset = chapter.index - durChapterIndex) {
0 -> { 0 -> {
curTextChapter?.cancelLayout() curTextChapter?.cancelLayout()
curTextChapter?.setProgressListener(null)
curTextChapter = textChapter curTextChapter = textChapter
if (resetPageOffset) { if (resetPageOffset) {
callBack?.resetPageOffset() callBack?.resetPageOffset()
@@ -295,6 +295,7 @@ data class TextChapter(
fun cancelLayout() { fun cancelLayout() {
layout?.cancel() layout?.cancel()
isCompleted = true isCompleted = true
listener = null
} }
companion object { companion object {
@@ -107,6 +107,7 @@ class TextChapterLayout(
fun cancel() { fun cancel() {
job.cancel() job.cancel()
listener = null
} }
private fun onPageCompleted() { private fun onPageCompleted() {