From ab913a304c997c48a8ccf6e9e2c04b32f92a3b60 Mon Sep 17 00:00:00 2001
From: Xwite <1797350009@qq.com>
Date: Sun, 30 Jan 2022 15:54:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=9A=E6=8C=89=E8=BF=94=E5=9B=9E=E9=94=AE=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E6=90=9C=E7=B4=A2=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/legado/app/ui/book/read/ReadBookActivity.kt    | 7 +++++++
 app/src/main/java/io/legado/app/ui/book/read/SearchMenu.kt | 5 ++---
 2 files changed, 9 insertions(+), 3 deletions(-)

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 136aa71f5..ab35358a1 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
@@ -382,6 +382,12 @@ class ReadBookActivity : BaseReadBookActivity(),
                 binding.readView.pageDelegate?.keyTurnPage(PageDirection.NEXT)
                 return true
             }
+            keyCode == KeyEvent.KEYCODE_BACK -> {
+                if (isShowingSearchResult) {
+                    exitSearchMenu()
+                    return true
+                }
+            }
         }
         return super.onKeyDown(keyCode, event)
     }
@@ -807,6 +813,7 @@ class ReadBookActivity : BaseReadBookActivity(),
         if (isShowingSearchResult) {
             isShowingSearchResult = false
             binding.searchMenu.invalidate()
+            binding.searchMenu.invisible()
         }
     }
 
diff --git a/app/src/main/java/io/legado/app/ui/book/read/SearchMenu.kt b/app/src/main/java/io/legado/app/ui/book/read/SearchMenu.kt
index 74712ea65..53f3b8868 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/SearchMenu.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/SearchMenu.kt
@@ -119,7 +119,7 @@ class SearchMenu @JvmOverloads constructor(
     }
 
     private fun bindEvent() = binding.run {
-
+        //搜索结果
         llSearchResults.setOnClickListener {
             runMenuOut {
                 callBack.openSearchActivity(selectedSearchResult?.query)
@@ -134,11 +134,10 @@ class SearchMenu @JvmOverloads constructor(
             }
         }
 
-        //目录
+        //退出
         llSearchExit.setOnClickListener {
             runMenuOut {
                 callBack.exitSearchMenu()
-                this@SearchMenu.invisible()
             }
         }