优化
This commit is contained in:
@@ -90,17 +90,16 @@ 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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun clearTextChapter() {
|
||||
prevTextChapter = null
|
||||
|
||||
@@ -220,6 +220,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
|
||||
}
|
||||
|
||||
fun openChapter(index: Int, durChapterPos: Int = 0, success: (() -> Unit)? = null) {
|
||||
if (index < ReadBook.chapterSize) {
|
||||
ReadBook.clearTextChapter()
|
||||
ReadBook.callBack?.upContent()
|
||||
if (index != ReadBook.durChapterIndex) {
|
||||
@@ -231,6 +232,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
|
||||
success?.invoke()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun removeFromBookshelf(success: (() -> Unit)?) {
|
||||
execute {
|
||||
|
||||
Reference in New Issue
Block a user