From b9742e7c2a37eed046377a3b1946321502ef092f Mon Sep 17 00:00:00 2001
From: Horis <8674809+821938089@users.noreply.github.com>
Date: Fri, 21 Mar 2025 17:37:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/book/manga/ReadMangaActivity.kt    |  2 +-
 .../ui/book/manga/recyclerview/ScrollTimer.kt | 50 +++++++++----------
 .../io/legado/app/ui/book/read/MangaMenu.kt   |  2 +-
 3 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt b/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt
index a03c03229..8e707a5b4 100644
--- a/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/manga/ReadMangaActivity.kt
@@ -119,7 +119,7 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
     private var justInitData: Boolean = false
     private var syncDialog: AlertDialog? = null
     private val mScrollTimer by lazy {
-        ScrollTimer(lifecycleScope, this).apply {
+        ScrollTimer(this, binding.mRecyclerManga).apply {
             setSpeed(AppConfig.mangaAutoPageSpeed)
         }
     }
diff --git a/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/ScrollTimer.kt b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/ScrollTimer.kt
index 0ca9bc5d7..beaf0bbc9 100644
--- a/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/ScrollTimer.kt
+++ b/app/src/main/java/io/legado/app/ui/book/manga/recyclerview/ScrollTimer.kt
@@ -1,46 +1,44 @@
 package io.legado.app.ui.book.manga.recyclerview
 
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.isActive
-import kotlinx.coroutines.launch
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE
 
 class ScrollTimer(
-    private val coroutineScope: CoroutineScope,
-    private val callback: ScrollCallback
-) {
-    private var job: Job? = null
-    private var delayMs: Long = 20L
+    private val callback: ScrollCallback,
+    private val recyclerView: RecyclerView
+) : RecyclerView.OnScrollListener() {
     private var distance = 1
     var isEnabled: Boolean = false
         set(value) {
             if (field != value) {
                 field = value
-                restartJob()
+                if (value) {
+                    recyclerView.addOnScrollListener(this)
+                    startScroll()
+                } else {
+                    recyclerView.removeOnScrollListener(this)
+                }
             }
         }
 
+    override fun onScrollStateChanged(
+        recyclerView: RecyclerView,
+        newState: Int
+    ) {
+        if (newState == SCROLL_STATE_IDLE) {
+            startScroll()
+        }
+    }
+
     fun setSpeed(distance: Int) {
         this.distance = distance
-        restartJob()
     }
 
-    private fun restartJob() {
-        job?.cancel()
-        if (!isEnabled || delayMs == 0L) {
-            job = null
-            return
-        }
-        job = coroutineScope.launch {
-            while (isActive) {
-                callback.scrollBy(distance)
-                delay(delayMs)
-            }
-        }
+    private fun startScroll() {
+        callback.scrollBy(distance)
     }
 
-    interface ScrollCallback{
-        fun scrollBy(distance:Int)
+    interface ScrollCallback {
+        fun scrollBy(distance: Int)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/book/read/MangaMenu.kt b/app/src/main/java/io/legado/app/ui/book/read/MangaMenu.kt
index 2a3a7a50d..27e599a7f 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/MangaMenu.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/MangaMenu.kt
@@ -233,7 +233,7 @@ class MangaMenu @JvmOverloads constructor(
     interface CallBack {
         fun openBookInfoActivity()
         fun upSystemUiVisibility(menuIsVisible: Boolean)
-        fun skipToPage(pos: Int)
+        fun skipToPage(index: Int)
     }
 
 }
\ No newline at end of file