From e2dccabdd523c9b7013fd190f105412a6d6e9bf9 Mon Sep 17 00:00:00 2001
From: HapeLee <1321903405@qq.com>
Date: Thu, 11 Sep 2025 14:06:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A9=E5=AD=90=E4=BB=AC=E8=BF=99=E6=AC=A1?=
 =?UTF-8?q?=E7=9C=9F=E4=BF=AE=E4=BA=86=20=E4=BF=AE=E5=A4=8D=E4=BB=8E?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=BF=9B=E5=85=A5=E5=89=8D=E5=8F=B0=E4=B8=94?=
 =?UTF-8?q?Activity=E8=A2=AB=E7=B3=BB=E7=BB=9F=E5=9B=9E=E6=94=B6=E6=97=B6?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E4=B9=A6=E7=B1=8D=E6=9C=AA=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E5=92=8CNPE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kazusa/ui/book/read/ReadBookActivity.kt    | 18 ++++++++++++++----
 .../kazusa/ui/book/read/page/ReadView.kt       |  5 +++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legato/kazusa/ui/book/read/ReadBookActivity.kt
index 7e97fe9e5..66be471fe 100644
--- a/app/src/main/java/io/legato/kazusa/ui/book/read/ReadBookActivity.kt
+++ b/app/src/main/java/io/legato/kazusa/ui/book/read/ReadBookActivity.kt
@@ -253,7 +253,7 @@ class ReadBookActivity : BaseReadBookActivity(),
     @SuppressLint("ClickableViewAccessibility")
     override fun onCreate(savedInstanceState: Bundle?) {
 
-        if (AppConfig.sharedElementEnterTransitionEnable && savedInstanceState == null) {
+        if (AppConfig.sharedElementEnterTransitionEnable) {
 
             val transform = MaterialContainerTransform().apply {
                 addTarget(binding.rootView)
@@ -280,8 +280,7 @@ class ReadBookActivity : BaseReadBookActivity(),
                     override fun onTransitionResume(transition: Transition) {}
                 })
             }
-        } else {
-            loadBook()
+
         }
         window.sharedElementReturnTransition =
             MaterialSharedAxis(MaterialSharedAxis.X, true).apply {
@@ -289,6 +288,10 @@ class ReadBookActivity : BaseReadBookActivity(),
             }
         super.onCreate(savedInstanceState)
 
+        if (savedInstanceState != null && AppConfig.delayBookLoadEnable) {
+            loadBook()
+        }
+
         if (AppConfig.sharedElementEnterTransitionEnable)
             binding.rootView.transitionName = intent.getStringExtra("transitionName")
 
@@ -325,6 +328,13 @@ class ReadBookActivity : BaseReadBookActivity(),
         }
     }
 
+    override fun onPostCreate(savedInstanceState: Bundle?) {
+        super.onPostCreate(savedInstanceState)
+        if (!AppConfig.delayBookLoadEnable || !AppConfig.sharedElementEnterTransitionEnable) {
+            loadBook()
+        }
+    }
+
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         viewModel.initData(intent)
@@ -440,7 +450,7 @@ class ReadBookActivity : BaseReadBookActivity(),
         lifecycleScope.launch(Dispatchers.Default) {
             viewModel.initReadBookConfig(intent)
             viewModel.initData(intent)
-            withContext(Dispatchers.Main) {
+            withContext(Main) {
                 binding.readView.initAfterTransition()
                 justInitData = true
             }
diff --git a/app/src/main/java/io/legato/kazusa/ui/book/read/page/ReadView.kt b/app/src/main/java/io/legato/kazusa/ui/book/read/page/ReadView.kt
index 261a745b3..ee87266f9 100644
--- a/app/src/main/java/io/legato/kazusa/ui/book/read/page/ReadView.kt
+++ b/app/src/main/java/io/legato/kazusa/ui/book/read/page/ReadView.kt
@@ -236,9 +236,10 @@ class ReadView(context: Context, attrs: AttributeSet) :
                 removeCallbacks(longPressRunnable)
                 if (!pressDown) return true
                 pressDown = false
-                if (!pageDelegate!!.isMoved && !isMove) {
+                if (pageDelegate?.isMoved == false && !isMove) {
                     if (!longPressed && !pressOnTextSelected) {
-                        if (!curPage.onClick(startX, startY)) {
+                        val handled = curPage.onClick(startX, startY)
+                        if (!handled) {
                             onSingleTapUp()
                         }
                         return true