diff --git a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt index a89d78ec8..d37fda70f 100644 --- a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt @@ -117,8 +117,9 @@ class AnalyzeUrl( //替换所有内嵌{{js}} val url = analyze.innerRule("{{", "}}") { - when (val jsEval = SCRIPT_ENGINE.eval(it, bindings)) { - is String -> jsEval + val jsEval = SCRIPT_ENGINE.eval(it, bindings) ?: "" + when { + jsEval is String -> jsEval jsEval is Double && jsEval % 1.0 == 0.0 -> String.format("%.0f", jsEval) else -> jsEval.toString() } diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt index 354d665e9..9e4b37673 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt @@ -592,7 +592,7 @@ class ReadBookActivity : ReadBookBaseActivity(), resetPageOffset: Boolean, success: (() -> Unit)? ) { - lifecycleScope.launch { + runOnUI { autoPageProgress = 0 binding.readView.upContent(relativePosition, resetPageOffset) binding.readMenu.setSeekPage(ReadBook.durPageIndex()) @@ -605,13 +605,13 @@ class ReadBookActivity : ReadBookBaseActivity(), * 更新视图 */ override fun upView() { - lifecycleScope.launch { + runOnUI { binding.readMenu.upBookView() } } override fun upPageAnim() { - lifecycleScope.launch { + runOnUI { binding.readView.upPageAnim() } } @@ -620,11 +620,11 @@ class ReadBookActivity : ReadBookBaseActivity(), * 页面改变 */ override fun pageChanged() { - autoPageProgress = 0 - lifecycleScope.launch { + runOnUI { + autoPageProgress = 0 binding.readMenu.setSeekPage(ReadBook.durPageIndex()) + mHandler.postDelayed(backupRunnable, 600000) } - mHandler.postDelayed(backupRunnable, 600000) } /**