优化

app/src/main/java/io/legado/app/ui/book/read/page/AutoPager.kt

@@ -14,11 +14,12 @@ import io.legado.app.utils.canvasrecorder.recordIfNeeded
 /**
  * 自动翻页
  */
-class AutoPager(private val readView: ReadView) {
+class AutoPager(private val readView: ReadView) : Runnable {
     private var progress = 0
     var isRunning = false
         private set
     private var isPausing = false
+    private var isEInkMode = false
     private var scrollOffsetRemain = 0.0
     private var scrollOffset = 0
     private var lastTimeMillis = 0L
@@ -28,10 +29,15 @@ class AutoPager(private val readView: ReadView) {
 
     fun start() {
         isRunning = true
-        paint.color = ThemeStore.accentColor
+        isEInkMode = AppConfig.isEInkMode
-        lastTimeMillis = SystemClock.uptimeMillis()
         readView.curPage.upSelectAble(false)
-        readView.invalidate()
+        if (isEInkMode) {
+            readView.postDelayed(this, ReadBookConfig.autoReadSpeed * 1000L)
+        } else {
+            paint.color = ThemeStore.accentColor
+            lastTimeMillis = SystemClock.uptimeMillis()
+            readView.invalidate()
+        }
     }
 
     fun stop() {
@@ -40,6 +46,8 @@ class AutoPager(private val readView: ReadView) {
         }
         isRunning = false
         isPausing = false
+        isEInkMode = false
+        readView.removeCallbacks(this)
         readView.curPage.upSelectAble(AppConfig.textSelectAble)
         readView.invalidate()
         reset()
@@ -51,6 +59,7 @@ class AutoPager(private val readView: ReadView) {
             return
         }
         isPausing = true
+        readView.removeCallbacks(this)
     }
 
     fun resume() {
@@ -58,8 +67,12 @@ class AutoPager(private val readView: ReadView) {
             return
         }
         isPausing = false
-        lastTimeMillis = SystemClock.uptimeMillis()
+        if (isEInkMode) {
-        readView.invalidate()
+            readView.postDelayed(this, ReadBookConfig.autoReadSpeed * 1000L)
+        } else {
+            lastTimeMillis = SystemClock.uptimeMillis()
+            readView.invalidate()
+        }
     }
 
     fun reset() {
@@ -75,7 +88,7 @@ class AutoPager(private val readView: ReadView) {
     }
 
     fun onDraw(canvas: Canvas) {
-        if (!isRunning) {
+        if (!isRunning || isEInkMode) {
             return
         }
 
@@ -106,7 +119,7 @@ class AutoPager(private val readView: ReadView) {
     }
 
     fun computeOffset() {
-        if (!isRunning || isPausing) {
+        if (!isRunning || isPausing || isEInkMode) {
             return
         }
 
@@ -134,4 +147,12 @@ class AutoPager(private val readView: ReadView) {
         }
     }
 
+    override fun run() {
+        if (!readView.fillPage(PageDirection.NEXT)) {
+            stop()
+        } else {
+            readView.postDelayed(this, ReadBookConfig.autoReadSpeed * 1000L)
+        }
+    }
+
 }