YanLongChangAn/legado
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
gedoor
2022-01-10 20:54:13 +08:00
parent 95e0d64061
commit f94ce733b2
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/model/ReadBook.kt
+3 -4
View File
@@ -90,17 +90,16 @@ object ReadBook : CoroutineScope by MainScope() {
} }
fun setProgress(progress: BookProgress) { fun setProgress(progress: BookProgress) {
if (durChapterIndex != progress.durChapterIndex if (progress.durChapterIndex > chapterSize &&
|| durChapterPos != progress.durChapterPos (durChapterIndex != progress.durChapterIndex
|| durChapterPos != progress.durChapterPos)
) { ) {
if (progress.durChapterIndex > chapterSize) {
durChapterIndex = progress.durChapterIndex durChapterIndex = progress.durChapterIndex
durChapterPos = progress.durChapterPos durChapterPos = progress.durChapterPos
clearTextChapter() clearTextChapter()
loadContent(resetPageOffset = true) loadContent(resetPageOffset = true)
} }
} }
}
fun clearTextChapter() { fun clearTextChapter() {
prevTextChapter = null prevTextChapter = null
app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt
+2
View File
@@ -220,6 +220,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
} }
fun openChapter(index: Int, durChapterPos: Int = 0, success: (() -> Unit)? = null) { fun openChapter(index: Int, durChapterPos: Int = 0, success: (() -> Unit)? = null) {
if (index < ReadBook.chapterSize) {
ReadBook.clearTextChapter() ReadBook.clearTextChapter()
ReadBook.callBack?.upContent() ReadBook.callBack?.upContent()
if (index != ReadBook.durChapterIndex) { if (index != ReadBook.durChapterIndex) {
@@ -231,6 +232,7 @@ class ReadBookViewModel(application: Application) : BaseViewModel(application) {
success?.invoke() success?.invoke()
} }
} }
}
fun removeFromBookshelf(success: (() -> Unit)?) { fun removeFromBookshelf(success: (() -> Unit)?) {
execute { execute {