From f71a47ef7621273dc992ea4c866e3aaa3f888bc0 Mon Sep 17 00:00:00 2001
From: Horis <8674809+821938089@users.noreply.github.com>
Date: Sat, 22 Mar 2025 22:17:43 +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

---
 .../legado/app/ui/book/manga/ReadMangaActivity.kt |  7 +++----
 .../app/ui/book/manga/recyclerview/ScrollTimer.kt | 15 +++++----------
 2 files changed, 8 insertions(+), 14 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 7e00eb19f..f6aeab09c 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
@@ -73,6 +73,7 @@ import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.text.DecimalFormat
+import kotlin.math.ceil
 
 class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewModel>(),
     ReadManga.Callback, ChangeBookSourceDialog.CallBack, MangaMenu.CallBack,
@@ -428,10 +429,8 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
         if (binding.mRecyclerManga.isAtBottom()) {
             return
         }
-        binding.mRecyclerManga.smoothScrollBy(
-            if (mAdapter.isHorizontal) distance else 0,
-            if (mAdapter.isHorizontal) 0 else distance, mLinearInterpolator, 16
-        )
+        val time = ceil(16f / distance * 10000).toInt()
+        binding.mRecyclerManga.smoothScrollBy(10000, 10000, mLinearInterpolator, time)
     }
 
     override fun scrollPage() {
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 f24602fed..fb46d3523 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,21 +1,17 @@
 package io.legado.app.ui.book.manga.recyclerview
 
-import androidx.lifecycle.LifecycleCoroutineScope
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.coroutineScope
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 
 class ScrollTimer(
     private val callback: ScrollCallback,
     private val recyclerView: RecyclerView,
-    private val coroutine: LifecycleCoroutineScope,
+    private val coroutineScope: CoroutineScope,
 ) : RecyclerView.OnScrollListener() {
     private var distance = 1
     private var mScrollPageJob: Job? = null
@@ -28,6 +24,7 @@ class ScrollTimer(
                     startScroll()
                 } else {
                     recyclerView.removeOnScrollListener(this)
+                    recyclerView.stopScroll()
                 }
             }
         }
@@ -63,12 +60,10 @@ class ScrollTimer(
     }
 
     private fun startScrollPage() {
-        mScrollPageJob = coroutine.launch(Dispatchers.Default) {
+        mScrollPageJob = coroutineScope.launch {
             while (isActive) {
                 delay(distance.times(1000L))
-                withContext(Dispatchers.Main) {
-                    callback.scrollPage()
-                }
+                callback.scrollPage()
             }
         }
     }