From 92cfe5dc494e06d7befca04b737eb5ff7a4618d9 Mon Sep 17 00:00:00 2001 From: fengyuecanzhu <1021300691@qq.com> Date: Tue, 2 Mar 2021 08:20:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=90=9C=E7=B4=A2=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- app/src/main/assets/updatelog.fy | 4 ++-- .../xyz/fycz/myreader/model/source/BookSourceManager.java | 1 + .../xyz/fycz/myreader/ui/activity/SourceDebugActivity.java | 2 +- .../xyz/fycz/myreader/webapi/crawler/ReadCrawlerUtil.java | 5 ++++- app/version_code.properties | 4 ++-- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index e184aeb..bf5521f 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ 风月读书,一款开源、无广告的小说阅读软件。 -成品下载(v1.9.1 支持自定义书源):[https://fycz.lanzous.com/ijJsnmcfwja](https://fycz.lanzous.com/ijJsnmcfwja) +成品下载(v1.9.2 支持自定义书源):[https://fycz.lanzous.com/iMpIkmcv9dc](https://fycz.lanzous.com/iMpIkmcv9dc) [更新日志](./app/src/main/assets/updatelog.fy) diff --git a/app/src/main/assets/updatelog.fy b/app/src/main/assets/updatelog.fy index 22fd0fe..063760b 100644 --- a/app/src/main/assets/updatelog.fy +++ b/app/src/main/assets/updatelog.fy @@ -1,5 +1,5 @@ -2021.03.01 -风月读书v1.9.1 +2021.03.02 +风月读书v1.9.2 更新内容: 1、优化搜索 2、修复已知bug diff --git a/app/src/main/java/xyz/fycz/myreader/model/source/BookSourceManager.java b/app/src/main/java/xyz/fycz/myreader/model/source/BookSourceManager.java index 43880c6..4f2dddc 100644 --- a/app/src/main/java/xyz/fycz/myreader/model/source/BookSourceManager.java +++ b/app/src/main/java/xyz/fycz/myreader/model/source/BookSourceManager.java @@ -109,6 +109,7 @@ public class BookSourceManager { */ @Nullable public static BookSource getBookSourceByEName(String ename) { + if (ename == null) return getDefaultSource(); if ("local".equals(ename)) return getLocalSource(); BookSource source = GreenDaoManager.getDaoSession().getBookSourceDao(). queryBuilder() diff --git a/app/src/main/java/xyz/fycz/myreader/ui/activity/SourceDebugActivity.java b/app/src/main/java/xyz/fycz/myreader/ui/activity/SourceDebugActivity.java index a440f7d..7b20bc2 100644 --- a/app/src/main/java/xyz/fycz/myreader/ui/activity/SourceDebugActivity.java +++ b/app/src/main/java/xyz/fycz/myreader/ui/activity/SourceDebugActivity.java @@ -82,7 +82,7 @@ public class SourceDebugActivity extends BaseActivity { protected void initData(Bundle savedInstanceState) { super.initData(savedInstanceState); debugEntity = getIntent().getParcelableExtra("debugEntity"); - rc = ReadCrawlerUtil.getReadCrawler(debugEntity.getBookSource()); + rc = ReadCrawlerUtil.getReadCrawler(debugEntity.getBookSource(), true); } @Override diff --git a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/ReadCrawlerUtil.java b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/ReadCrawlerUtil.java index 24fe082..5511b30 100644 --- a/app/src/main/java/xyz/fycz/myreader/webapi/crawler/ReadCrawlerUtil.java +++ b/app/src/main/java/xyz/fycz/myreader/webapi/crawler/ReadCrawlerUtil.java @@ -174,6 +174,9 @@ public class ReadCrawlerUtil { } public static ReadCrawler getReadCrawler(BookSource source) { + return getReadCrawler(source, false); + } + public static ReadCrawler getReadCrawler(BookSource source, boolean isInfo) { try { if (StringHelper.isEmpty(source.getSourceEName())) { BaseSourceCrawler crawler; @@ -190,7 +193,7 @@ public class ReadCrawlerUtil { crawler = new JsonPathCrawler(source); break; } - if (source.getSearchRule().isRelatedWithInfo()) { + if (source.getSearchRule().isRelatedWithInfo() || isInfo) { return crawler; } else { return new BaseSourceCrawlerNoInfo(crawler); diff --git a/app/version_code.properties b/app/version_code.properties index 15d3bf6..67cb482 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Mon Mar 01 20:09:11 CST 2021 -VERSION_CODE=191 +#Tue Mar 02 08:12:15 CST 2021 +VERSION_CODE=192