From f363424769a9d5b0947b412bdfb2a703098ab95b Mon Sep 17 00:00:00 2001
From: HapeLee <1321903405@qq.com>
Date: Tue, 10 Mar 2026 18:13:10 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E9=98=85=E8=AF=BB?=
 =?UTF-8?q?=E4=B9=A6=E7=B1=8D=E6=9C=AA=E5=9C=A8=E4=B9=A6=E6=9E=B6=E6=97=B6?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=BF=94=E5=9B=9E=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/legado/app/ui/book/audio/AudioPlayActivity.kt   | 10 ++--------
 .../io/legado/app/ui/book/read/ReadBookActivity.kt     | 10 ++--------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt b/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt
index 0cce438a3..2fc5822bf 100644
--- a/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt
@@ -158,20 +158,14 @@ class AudioPlayActivity :
         initView()
         onBackPressedDispatcher.addCallback(this){
             if (savedInstanceState != null || !AudioPlay.inBookshelf) {
-                finish()
+                supportFinishAfterTransition()
             } else {
+                callBackBookEnd()
                 supportFinishAfterTransition()
             }
         }
     }
 
-    override fun finish() {
-        if (AudioPlay.inBookshelf) {
-            callBackBookEnd()
-            return super.finish()
-        }
-    }
-
     override fun onCompatCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.audio_play, menu)
         return super.onCompatCreateOptionsMenu(menu)
diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
index f14a25a51..6ceacd6f5 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
@@ -354,9 +354,10 @@ class ReadBookActivity : BaseReadBookActivity(),
             }
             if (savedInstanceState != null || !ReadBook.inBookshelf) {
                 ReadBook.commitReadSession()
-                finish()
+                supportFinishAfterTransition()
             } else {
                 ReadBook.commitReadSession()
+                callBackBookEnd()
                 supportFinishAfterTransition()
             }
             //TODO: 有关测量相关问题
@@ -1865,13 +1866,6 @@ class ReadBookActivity : BaseReadBookActivity(),
         }
     }
 
-    override fun finish() {
-        if (ReadBook.inBookshelf) {
-            callBackBookEnd()
-            return super.finish()
-        }
-    }
-
     private fun callBackBookEnd() {
         SourceCallBack.callBackBook(
             SourceCallBack.END_READ,