From 6f7a518309f3079d21cadd5f8a4cb60abec53e9a Mon Sep 17 00:00:00 2001 From: Celeter Date: Thu, 26 Dec 2019 21:50:47 +0800 Subject: [PATCH 1/3] up --- app/src/main/assets/updateLog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/assets/updateLog.md b/app/src/main/assets/updateLog.md index d424bc6cb..915ffb74d 100644 --- a/app/src/main/assets/updateLog.md +++ b/app/src/main/assets/updateLog.md @@ -4,6 +4,7 @@ * 先在旧版阅读2.19进行备份，再在新版阅读3.0的【我的】中，点击【备份与恢复】，选择【导入旧版本数据】，提示需要存储权限，选择允许即可导入成功。 * 注意：由于安卓10更改了权限策略，还需要给「允许安装其他应用」的权限才能导入源。MIUI11也需要此权限。 + **2019/12/15** * 修复清理缓存会把其他文件删除的问题 From e707336f0185a22f55e10f98a8babf08f7965cfd Mon Sep 17 00:00:00 2001 From: Celeter Date: Mon, 30 Dec 2019 16:05:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B9=A6=E6=BA=90?= =?UTF-8?q?=E8=B0=83=E8=AF=95=E5=92=8CRSS=20=E3=83=BB=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E9=A1=B5=E5=92=8C=E6=AD=A3=E6=96=87=E9=A1=B5?= =?UTF-8?q?=E8=B0=83=E8=AF=95=20=E3=83=BB=E4=BF=AE=E6=94=B9RSS=E7=9A=84?= =?UTF-8?q?=E4=BC=9A=E6=A0=B9=E6=8D=AE=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8?= =?UTF-8?q?style=E6=9D=A5=E8=87=AA=E5=8A=A8=E5=A2=9E=E5=8A=A0img=E3=80=81v?= =?UTF-8?q?ideo=E3=80=81body=E7=9A=84style?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/legado/app/model/Debug.kt | 18 ++++++++++++++++ .../app/ui/rss/read/ReadRssViewModel.kt | 21 ++++++++++--------- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/io/legado/app/model/Debug.kt b/app/src/main/java/io/legado/app/model/Debug.kt index fee62972e..7d7ec3627 100644 --- a/app/src/main/java/io/legado/app/model/Debug.kt +++ b/app/src/main/java/io/legado/app/model/Debug.kt @@ -111,6 +111,24 @@ object Debug { log(webBook.sourceUrl, "⇒开始访问发现页:$url") exploreDebug(webBook, url) } + key.startsWith("++")-> { + val url = key.substring(2) + val book = Book() + book.origin = webBook.sourceUrl + book.tocUrl = url + log(webBook.sourceUrl, "⇒开始访目录页:$url") + tocDebug(webBook, book) + } + key.startsWith("--")-> { + val url = key.substring(2) + val book = Book() + book.origin = webBook.sourceUrl + log(webBook.sourceUrl, "⇒开始访正文页:$url") + val chapter = BookChapter() + chapter.title = "调试" + chapter.url = url + contentDebug(webBook, book, chapter, null) + } else -> { log(webBook.sourceUrl, "⇒开始搜索关键字:$key") searchDebug(webBook, key) diff --git a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt index 8c6f56279..98355d7d8 100644 --- a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt @@ -78,16 +78,17 @@ class ReadRssViewModel(application: Application) : BaseViewModel(application) { } fun clHtml(content: String): String { - return """ - - - - - - - $content - - """ + return if (content.contains("$content + """ + } } interface CallBack { From d12c176eff69839101ada17ee4f9bf765bdf67a5 Mon Sep 17 00:00:00 2001 From: Celeter Date: Mon, 30 Dec 2019 16:36:00 +0800 Subject: [PATCH 3/3] up --- app/src/main/assets/updateLog.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/app/src/main/assets/updateLog.md b/app/src/main/assets/updateLog.md index 17989e384..06c0bcaac 100644 --- a/app/src/main/assets/updateLog.md +++ b/app/src/main/assets/updateLog.md @@ -4,6 +4,24 @@ * 先在旧版阅读(2.x)中进行备份，然后在新版阅读(3.x)【我的】->【备份与恢复】，选择【导入旧版本数据】，提示存储权限，选择允许即可导入成功。 * 注意：由于安卓10更改了权限策略，还需要给「允许安装其他应用」的权限才能导入源。MIUI11也需要此权限。 +**2019/12/30** +* 修改书源调试 + - 调试搜索>>输入关键字，如：`系统` + - 调试发现>>输入发现URL，如：`月票榜::https://www.qidian.com/rank/yuepiao?page={{page}}` + - 调试详情页>>输入详情页URL，如：`https://m.qidian.com/book/1015609210` + - 调试目录页>>输入目录页URL，如：`++https://www.zhaishuyuan.com/read/30394` + - 调试正文页>>输入正文页URL，如：`--https://www.zhaishuyuan.com/chapter/30394/20940996` + +* 修改订阅中自动添加style的情景 + 订阅源的内容规则中存在` + ``` + **2019/12/28** * 添加下载界面 * 添加分组备份