mirror of
https://github.com/gedoor/legado.git
synced 2024-07-06 23:47:49 +08:00
优化
This commit is contained in:
parent
95e0d64061
commit
f94ce733b2
@ -90,15 +90,14 @@ object ReadBook : CoroutineScope by MainScope() {
|
||||
}
|
||||
|
||||
fun setProgress(progress: BookProgress) {
|
||||
if (durChapterIndex != progress.durChapterIndex
|
||||
|| durChapterPos != progress.durChapterPos
|
||||
if (progress.durChapterIndex > chapterSize &&
|
||||
(durChapterIndex != progress.durChapterIndex
|
||||
|| durChapterPos != progress.durChapterPos)
|
||||
) {
|
||||
if (progress.durChapterIndex > chapterSize) {
|
||||
durChapterIndex = progress.durChapterIndex
|
||||
durChapterPos = progress.durChapterPos
|
||||
clearTextChapter()
|
||||
loadContent(resetPageOffset = true)
|
||||
}
|
||||
durChapterIndex = progress.durChapterIndex
|
||||
durChapterPos = progress.durChapterPos
|
||||
clearTextChapter()
|
||||
loadContent(resetPageOffset = true)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -220,15 +220,17 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
|
||||
}
|
||||
|
||||
fun openChapter(index: Int, durChapterPos: Int = 0, success: (() -> Unit)? = null) {
|
||||
ReadBook.clearTextChapter()
|
||||
ReadBook.callBack?.upContent()
|
||||
if (index != ReadBook.durChapterIndex) {
|
||||
ReadBook.durChapterIndex = index
|
||||
ReadBook.durChapterPos = durChapterPos
|
||||
}
|
||||
ReadBook.saveRead()
|
||||
ReadBook.loadContent(resetPageOffset = true) {
|
||||
success?.invoke()
|
||||
if (index < ReadBook.chapterSize) {
|
||||
ReadBook.clearTextChapter()
|
||||
ReadBook.callBack?.upContent()
|
||||
if (index != ReadBook.durChapterIndex) {
|
||||
ReadBook.durChapterIndex = index
|
||||
ReadBook.durChapterPos = durChapterPos
|
||||
}
|
||||
ReadBook.saveRead()
|
||||
ReadBook.loadContent(resetPageOffset = true) {
|
||||
success?.invoke()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user