From 9c09d0b18e03fb572c0128df594ef5b8660701a2 Mon Sep 17 00:00:00 2001
From: HapeLee <1321903405@qq.com>
Date: Thu, 11 Sep 2025 02:02:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=81=B6=E5=85=88=E7=9A=84?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E9=98=85=E8=AF=BB=E7=95=8C=E9=9D=A2=E6=97=B6?=
 =?UTF-8?q?=E4=B9=A6=E7=B1=8D=E4=B8=8D=E5=8A=A0=E8=BD=BD=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kazusa/ui/book/read/ReadBookActivity.kt   | 50 ++++++-------------
 1 file changed, 16 insertions(+), 34 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 1f1679c4e..7e97fe9e5 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) {
+        if (AppConfig.sharedElementEnterTransitionEnable && savedInstanceState == null) {
 
             val transform = MaterialContainerTransform().apply {
                 addTarget(binding.rootView)
@@ -267,28 +267,12 @@ class ReadBookActivity : BaseReadBookActivity(),
                     Transition.TransitionListener {
                     override fun onTransitionStart(transition: Transition) {}
                     override fun onTransitionEnd(transition: Transition) {
-                        lifecycleScope.launch(Dispatchers.Default) {
-                            viewModel.initReadBookConfig(intent)
-                            viewModel.initData(intent)
-
-                            withContext(Main) {
-                                binding.readView.initAfterTransition()
-                                justInitData = true
-                            }
-                        }
+                        loadBook()
                         transition.removeListener(this)
                     }
 
                     override fun onTransitionCancel(transition: Transition) {
-                        lifecycleScope.launch(Dispatchers.Default) {
-                            viewModel.initReadBookConfig(intent)
-                            viewModel.initData(intent)
-
-                            withContext(Main) {
-                                binding.readView.initAfterTransition()
-                                justInitData = true
-                            }
-                        }
+                        loadBook()
                         transition.removeListener(this)
                     }
 
@@ -296,6 +280,8 @@ class ReadBookActivity : BaseReadBookActivity(),
                     override fun onTransitionResume(transition: Transition) {}
                 })
             }
+        } else {
+            loadBook()
         }
         window.sharedElementReturnTransition =
             MaterialSharedAxis(MaterialSharedAxis.X, true).apply {
@@ -339,21 +325,6 @@ class ReadBookActivity : BaseReadBookActivity(),
         }
     }
 
-    override fun onPostCreate(savedInstanceState: Bundle?) {
-        super.onPostCreate(savedInstanceState)
-        if (!AppConfig.delayBookLoadEnable || !AppConfig.sharedElementEnterTransitionEnable) {
-            lifecycleScope.launch(Dispatchers.Default) {
-                viewModel.initReadBookConfig(intent)
-                viewModel.initData(intent)
-
-                withContext(Main) {
-                    binding.readView.initAfterTransition()
-                    justInitData = true
-                }
-            }
-        }
-    }
-
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         viewModel.initData(intent)
@@ -465,6 +436,17 @@ class ReadBookActivity : BaseReadBookActivity(),
         return super.onMenuOpened(featureId, menu)
     }
 
+    private fun loadBook() {
+        lifecycleScope.launch(Dispatchers.Default) {
+            viewModel.initReadBookConfig(intent)
+            viewModel.initData(intent)
+            withContext(Dispatchers.Main) {
+                binding.readView.initAfterTransition()
+                justInitData = true
+            }
+        }
+    }
+
     /**
      * 更新菜单
      */