gitea/legado
gitea/legado
1
1
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2024-09-01 09:34:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Strato69 2023-09-23 22:25:30 +08:00
commit de9de73568
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
View File

@ -171,6 +171,7 @@ class ReadBookActivity : BaseReadBookActivity(),
private val nextPageRunnable by lazy { Runnable { mouseWheelPage(PageDirection.NEXT) } } private val nextPageRunnable by lazy { Runnable { mouseWheelPage(PageDirection.NEXT) } }
private val prevPageRunnable by lazy { Runnable { mouseWheelPage(PageDirection.PREV) } } private val prevPageRunnable by lazy { Runnable { mouseWheelPage(PageDirection.PREV) } }
private var bookChanged = false private var bookChanged = false
private var pageChanged = false
//恢复跳转前进度对话框的交互结果 //恢复跳转前进度对话框的交互结果
private var confirmRestoreProcess: Boolean? = null private var confirmRestoreProcess: Boolean? = null
@ -833,6 +834,7 @@ class ReadBookActivity : BaseReadBookActivity(),
* 页面改变 * 页面改变
*/ */
override fun pageChanged() { override fun pageChanged() {
pageChanged = true
lifecycleScope.launch { lifecycleScope.launch {
autoPageProgress = 0 autoPageProgress = 0
upSeekBarProgress() upSeekBarProgress()
@ -1152,9 +1154,10 @@ class ReadBookActivity : BaseReadBookActivity(),
BaseReadAloudService.pause -> { BaseReadAloudService.pause -> {
val scrollPageAnim = ReadBook.pageAnim() == 3 val scrollPageAnim = ReadBook.pageAnim() == 3
if (scrollPageAnim) { if (scrollPageAnim && pageChanged) {
pageChanged = false
val startPos = binding.readView.getCurPagePosition() val startPos = binding.readView.getCurPagePosition()
ReadAloud.play(this, startPos = startPos) ReadBook.readAloud(startPos = startPos)
} else { } else {
ReadAloud.resume(this) ReadAloud.resume(this)
} }