From 6f164eb5018bf156fef1efa9075224c749581d1b Mon Sep 17 00:00:00 2001
From: fengyuecanzhu <1021300691@qq.com>
Date: Sun, 23 Jan 2022 21:12:19 +0800
Subject: [PATCH] v2.3.5

---
 app/src/main/assets/updatelog.fy                           | 7 +++++++
 .../java/xyz/fycz/myreader/application/CrashHandler.java   | 3 +++
 .../myreader/model/sourceAnalyzer/BookSourceManager.java   | 2 +-
 .../java/xyz/fycz/myreader/ui/activity/CrashActivity.java  | 2 ++
 app/version_code.properties                                | 2 +-
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/src/main/assets/updatelog.fy b/app/src/main/assets/updatelog.fy
index 1de5f64..1d3203f 100644
--- a/app/src/main/assets/updatelog.fy
+++ b/app/src/main/assets/updatelog.fy
@@ -1,3 +1,10 @@
+2022.01.23
+风月读书v2.3.5
+更新内容：
+1、修复部分发现无法加载下一页的问题
+2、新增应用崩溃记录界面
+3、书源网络支持蓝奏云文件链接(如有密码，用逗号隔开)
+
 2022.01.21
 风月读书v2.3.4
 更新内容:
diff --git a/app/src/main/java/xyz/fycz/myreader/application/CrashHandler.java b/app/src/main/java/xyz/fycz/myreader/application/CrashHandler.java
index 551111c..fcef098 100644
--- a/app/src/main/java/xyz/fycz/myreader/application/CrashHandler.java
+++ b/app/src/main/java/xyz/fycz/myreader/application/CrashHandler.java
@@ -39,6 +39,7 @@ import xyz.fycz.myreader.common.URLCONST;
 import xyz.fycz.myreader.ui.activity.CrashActivity;
 import xyz.fycz.myreader.ui.activity.RestartActivity;
 import xyz.fycz.myreader.ui.activity.SplashActivity;
+import xyz.fycz.myreader.util.ToastUtils;
 import xyz.fycz.myreader.util.utils.FileUtils;
 import xyz.fycz.myreader.util.utils.OkHttpUtils;
 
@@ -93,8 +94,10 @@ public final class CrashHandler implements Thread.UncaughtExceptionHandler {
         boolean deadlyCrash = currentCrashTime - lastCrashTime < 1000 * 60 * 5;
         // 如果是致命的异常，或者是调试模式下
         if (deadlyCrash || App.isDebug()) {
+            ToastUtils.showError("程序发生致命错误");
             CrashActivity.start(mApplication, throwable, logFilePath);
         } else {
+            ToastUtils.showError("程序发生错误，正在为您重启");
             RestartActivity.Companion.start(mApplication);
         }
 
diff --git a/app/src/main/java/xyz/fycz/myreader/model/sourceAnalyzer/BookSourceManager.java b/app/src/main/java/xyz/fycz/myreader/model/sourceAnalyzer/BookSourceManager.java
index 7e7839f..8e9fe8b 100644
--- a/app/src/main/java/xyz/fycz/myreader/model/sourceAnalyzer/BookSourceManager.java
+++ b/app/src/main/java/xyz/fycz/myreader/model/sourceAnalyzer/BookSourceManager.java
@@ -325,7 +325,7 @@ public class BookSourceManager {
         } else if (new File(string).isFile()) {
             return importSource(FileUtils.readText(string));
         }
-        if (string.contains("lanzou")) {
+        if (string.matches("https://.+\\.lanzou[a-z]\\.com/[\\s\\S]*")) {
             return LanZouApi.INSTANCE.getUrl(string)
                     .flatMap((Function<String, ObservableSource<String>>) s -> Observable.create(emitter -> {
                         emitter.onNext(OkHttpUtils.getHtml(s));
diff --git a/app/src/main/java/xyz/fycz/myreader/ui/activity/CrashActivity.java b/app/src/main/java/xyz/fycz/myreader/ui/activity/CrashActivity.java
index 1bf4d04..8fa674a 100644
--- a/app/src/main/java/xyz/fycz/myreader/ui/activity/CrashActivity.java
+++ b/app/src/main/java/xyz/fycz/myreader/ui/activity/CrashActivity.java
@@ -33,6 +33,7 @@ import xyz.fycz.myreader.application.App;
 import xyz.fycz.myreader.base.BaseActivity;
 import xyz.fycz.myreader.databinding.ActivityCrashBinding;
 import xyz.fycz.myreader.util.ShareUtils;
+import xyz.fycz.myreader.util.ToastUtils;
 
 /**
  * @author fengyue
@@ -171,6 +172,7 @@ public class CrashActivity extends BaseActivity {
         });
         binding.ivCrashRestart.setOnClickListener(v -> {
             // 重启应用
+            ToastUtils.showInfo("重启应用");
             RestartActivity.Companion.restart(this);
             finish();
         });
diff --git a/app/version_code.properties b/app/version_code.properties
index 08ea912..1a9cf6e 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,3 +1,3 @@
 #Fri Jun 18 21:45:31 CST 2021
-VERSION_CODE=234
+VERSION_CODE=235
 NEED_CREATE_RELEASE=true