From ab8f448ffe84c3469704934b2110049a1392dc0b Mon Sep 17 00:00:00 2001
From: lhjgege <1079947827@qq.com>
Date: Fri, 21 Mar 2025 16:08:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=99=E7=9B=AE=E5=89=8D=E6=9C=80=E5=A5=BD?=
 =?UTF-8?q?=E7=9A=84=E8=B0=83=E8=8A=82=E6=89=8D=E4=B8=8D=E4=BC=9A=E9=80=A0?=
 =?UTF-8?q?=E6=88=90=E6=8A=96=E5=8A=A8=20(#4855)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ...

* ...

* ...
---
 app/src/main/java/io/legado/app/model/ReadManga.kt  |  1 -
 .../legado/app/ui/book/manga/ReadMangaActivity.kt   | 13 +++++++++----
 .../app/ui/book/manga/recyclerview/ScrollTimer.kt   |  9 ++++++---
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/io/legado/app/model/ReadManga.kt b/app/src/main/java/io/legado/app/model/ReadManga.kt
index c708a28bc..0f0539cea 100644
--- a/app/src/main/java/io/legado/app/model/ReadManga.kt
+++ b/app/src/main/java/io/legado/app/model/ReadManga.kt
@@ -602,6 +602,5 @@ object ReadManga : CoroutineScope by MainScope() {
         fun sureNewProgress(progress: BookProgress)
         fun showLoading()
         fun startLoad()
-        fun scrollBy(delta: Int)
     }
 }
\ No newline at end of file
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 ab450e676..973d0bb58 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
@@ -9,6 +9,7 @@ import android.view.KeyEvent
 import android.view.Menu
 import android.view.MenuItem
 import android.view.WindowManager
+import android.view.animation.LinearInterpolator
 import androidx.activity.viewModels
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isGone
@@ -76,7 +77,7 @@ import java.text.DecimalFormat
 
 class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewModel>(),
     ReadManga.Callback, ChangeBookSourceDialog.CallBack, MangaMenu.CallBack,
-    MangaColorFilterDialog.Callback {
+    MangaColorFilterDialog.Callback, ScrollTimer.ScrollCallback {
 
     private val mLayoutManager by lazy {
         LinearLayoutManager(this)
@@ -120,6 +121,9 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
     private lateinit var mScrollTimer: ScrollTimer
     private var enableAutoPageScroll = false
     private var enableAutoScroll = false
+    private val mLinearInterpolator by lazy {
+        LinearInterpolator()
+    }
 
     private val loadMoreView by lazy {
         LoadMoreView(this).apply {
@@ -178,6 +182,7 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
                 ?: MangaFooterConfig()
         mScrollTimer = ScrollTimer(this).apply {
             setSpeed(AppConfig.mangaAutoPageSpeed)
+            callback = this@ReadMangaActivity
         }
     }
 
@@ -424,13 +429,13 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
         }
     }
 
-    override fun scrollBy(delta: Int) {
+    override fun scrollBy(distance: Int) {
         if (binding.mRecyclerManga.isAtBottom()) {
             return
         }
         binding.mRecyclerManga.smoothScrollBy(
-            if (mAdapter.isHorizontal) delta else 0,
-            if (mAdapter.isHorizontal) 0 else delta, null, 16
+            if (mAdapter.isHorizontal) distance else 0,
+            if (mAdapter.isHorizontal) 0 else distance, mLinearInterpolator, 16
         )
     }
 
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 c2bc87d7f..56c92ac43 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
@@ -13,9 +13,9 @@ class ScrollTimer(
 ) {
     private val coroutineScope = lifecycleOwner.lifecycleScope
     private var job: Job? = null
-    private var delayMs: Long = 16L
+    private var delayMs: Long = 20L
     private var distance = 1
-
+    lateinit var callback: ScrollCallback
     var isEnabled: Boolean = false
         set(value) {
             if (field != value) {
@@ -37,10 +37,13 @@ class ScrollTimer(
         }
         job = coroutineScope.launch {
             while (isActive) {
+                callback.scrollBy(distance)
                 delay(delayMs)
-                ReadManga.mCallback?.scrollBy(distance)
             }
         }
     }
 
+    interface ScrollCallback{
+        fun scrollBy(distance:Int)
+    }
 }
\ No newline at end of file