From 211ad560e9ac5fc88a946bbb8ed62d20169d2d9c Mon Sep 17 00:00:00 2001
From: fengyuecanzhu <1021300691@qq.com>
Date: Mon, 6 Dec 2021 22:49:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Djson=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E4=B9=A6=E6=BA=90=E6=97=A0=E6=B3=95=E5=AF=BC=E5=85=A5=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/release.md                                               | 5 ++---
 app/src/main/assets/updatelog.fy                             | 5 +++++
 .../main/java/xyz/fycz/myreader/model/SearchWordEngine.kt    | 4 ++--
 .../xyz/fycz/myreader/ui/fragment/DIYSourceFragment.java     | 2 +-
 .../main/java/xyz/fycz/myreader/widget/page/PageLoader.java  | 1 +
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/release.md b/app/release.md
index ba0add5..443a9ea 100644
--- a/app/release.md
+++ b/app/release.md
@@ -1,3 +1,2 @@
-* 1、新增书籍内容搜索(阅读界面菜单)
-* 2、修复内容替换bug
-* 3、修复书源导入bug
\ No newline at end of file
+* 1、优化内容搜索结果显示
+* 2、修复v2.2.4版本json格式书源无法导入的bug
\ No newline at end of file
diff --git a/app/src/main/assets/updatelog.fy b/app/src/main/assets/updatelog.fy
index 81d0c40..8c43364 100644
--- a/app/src/main/assets/updatelog.fy
+++ b/app/src/main/assets/updatelog.fy
@@ -1,4 +1,9 @@
 2021.12.06
+风月读书v2.2.5
+更新内容：
+1、优化内容搜索结果显示
+2、修复v2.2.4版本json格式书源无法导入的bug
+
 风月读书v2.2.4
 更新内容：
 1、新增书籍内容搜索(阅读界面菜单)
diff --git a/app/src/main/java/xyz/fycz/myreader/model/SearchWordEngine.kt b/app/src/main/java/xyz/fycz/myreader/model/SearchWordEngine.kt
index 2557795..9d2c821 100644
--- a/app/src/main/java/xyz/fycz/myreader/model/SearchWordEngine.kt
+++ b/app/src/main/java/xyz/fycz/myreader/model/SearchWordEngine.kt
@@ -133,8 +133,8 @@ class SearchWordEngine(
                             leftI = index - 20
                             leftS = "..."
                         }
-                        if (rightI > index + 20) {
-                            rightI = index + 20
+                        if (rightI > index + keyword.length + 20) {
+                            rightI = index + keyword.length + 20
                             rightS = "..."
                         }
                         val str = leftS + it.substring(leftI, rightI) + rightS
diff --git a/app/src/main/java/xyz/fycz/myreader/ui/fragment/DIYSourceFragment.java b/app/src/main/java/xyz/fycz/myreader/ui/fragment/DIYSourceFragment.java
index c985c50..2058917 100644
--- a/app/src/main/java/xyz/fycz/myreader/ui/fragment/DIYSourceFragment.java
+++ b/app/src/main/java/xyz/fycz/myreader/ui/fragment/DIYSourceFragment.java
@@ -327,7 +327,7 @@ public class DIYSourceFragment extends BaseFragment {
                 Single.create((SingleOnSubscribe<String>) emitter -> {
 //                    String json = FileUtils.readInStream(DocumentUtil.getFileInputSteam(getContext(), data.getData()));
                     DocumentFile file = DocumentFile.fromSingleUri(getContext(), data.getData());
-                    if (!file.getName().endsWith(".txt") && !file.getType().equals(".json")) {
+                    if (!file.getName().endsWith(".txt") && !file.getType().endsWith(".json")) {
                         emitter.onError(new Throwable("文件格式错误"));
                         return;
                     }
diff --git a/app/src/main/java/xyz/fycz/myreader/widget/page/PageLoader.java b/app/src/main/java/xyz/fycz/myreader/widget/page/PageLoader.java
index c571835..5f226a2 100644
--- a/app/src/main/java/xyz/fycz/myreader/widget/page/PageLoader.java
+++ b/app/src/main/java/xyz/fycz/myreader/widget/page/PageLoader.java
@@ -2221,6 +2221,7 @@ public abstract class PageLoader {
             charIndex2 = charIndex + keyword.length() - currentLine.length() - 1;
         }
         if (charIndex2 < 0) charIndex = 0;
+        if (charIndex2 >= currentLine.length()) charIndex2 = currentLine.length() - 1;
         return new int[]{pageIndex, lineIndex, charIndex, addLine, charIndex2};
     }