Просмотр исходного кода

Merge remote-tracking branch 'origin/master'

Strato69 3 лет назад
Родитель
Сommit
d29a4f938f
1 измененных файлов с 5 добавлено и 2 удалено
  1. 5 2
      app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt

+ 5 - 2
app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt

@@ -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)
                 }
                 }