From 5d8287d5b57bbeccd9234a011e08b0964dba102a Mon Sep 17 00:00:00 2001 From: Antecer Date: Fri, 5 Apr 2024 22:25:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E7=A7=BB=E5=B8=AE=E5=8A=A9=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E8=B7=AF=E5=BE=84=EF=BC=8C=E5=B9=B6=E7=BA=B3=E5=85=A5?= =?UTF-8?q?web=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/web/help/js/main.js | 2 +- .../help/md}/ExtensionContentType.md | 0 .../{help => web/help/md}/SourceMBookHelp.md | 0 .../{help => web/help/md}/SourceMRssHelp.md | 0 .../assets/{help => web/help/md}/appHelp.md | 0 .../assets/{help => web/help/md}/debugHelp.md | 0 .../{help => web/help/md}/dictRuleHelp.md | 0 .../{help => web/help/md}/httpTTSHelp.md | 0 .../assets/{help => web/help/md}/jsHelp.md | 0 .../{help => web/help/md}/readMenuHelp.md | 0 .../assets/{help => web/help/md}/regexHelp.md | 0 .../{help => web/help/md}/replaceRuleHelp.md | 0 .../assets/{help => web/help/md}/ruleHelp.md | 0 .../{help => web/help/md}/txtTocRuleHelp.md | 0 .../{help => web/help/md}/webDavBookHelp.md | 0 .../{help => web/help/md}/webDavHelp.md | 0 .../web/help/md/{xpath.md => xpathHelp.md} | 0 app/src/main/assets/web/src/rules.html | 24 ------------------- .../book/import/remote/RemoteBookActivity.kt | 2 +- .../source/edit/BookSourceEditActivity.kt | 2 +- .../ui/replace/edit/ReplaceEditActivity.kt | 2 +- .../rss/source/edit/RssSourceEditActivity.kt | 2 +- modules/web/src/components/SourceHelp.vue | 13 ++++------ 23 files changed, 10 insertions(+), 37 deletions(-) rename app/src/main/assets/{help => web/help/md}/ExtensionContentType.md (100%) rename app/src/main/assets/{help => web/help/md}/SourceMBookHelp.md (100%) rename app/src/main/assets/{help => web/help/md}/SourceMRssHelp.md (100%) rename app/src/main/assets/{help => web/help/md}/appHelp.md (100%) rename app/src/main/assets/{help => web/help/md}/debugHelp.md (100%) rename app/src/main/assets/{help => web/help/md}/dictRuleHelp.md (100%) rename app/src/main/assets/{help => web/help/md}/httpTTSHelp.md (100%) rename app/src/main/assets/{help => web/help/md}/jsHelp.md (100%) rename app/src/main/assets/{help => web/help/md}/readMenuHelp.md (100%) rename app/src/main/assets/{help => web/help/md}/regexHelp.md (100%) rename app/src/main/assets/{help => web/help/md}/replaceRuleHelp.md (100%) rename app/src/main/assets/{help => web/help/md}/ruleHelp.md (100%) rename app/src/main/assets/{help => web/help/md}/txtTocRuleHelp.md (100%) rename app/src/main/assets/{help => web/help/md}/webDavBookHelp.md (100%) rename app/src/main/assets/{help => web/help/md}/webDavHelp.md (100%) rename app/src/main/assets/web/help/md/{xpath.md => xpathHelp.md} (100%) delete mode 100644 app/src/main/assets/web/src/rules.html diff --git a/app/src/main/assets/web/help/js/main.js b/app/src/main/assets/web/help/js/main.js index 292177994..67c7c6716 100644 --- a/app/src/main/assets/web/help/js/main.js +++ b/app/src/main/assets/web/help/js/main.js @@ -27,7 +27,7 @@ require(['markdownit', 'highlight'], (mdit, hljs) => { }, }); - const path = '../md/'; + const path = '/help/md/'; const file = location.hash.slice(1).trim(); if (!file) return; fetch(`${path}${file}.md`) diff --git a/app/src/main/assets/help/ExtensionContentType.md b/app/src/main/assets/web/help/md/ExtensionContentType.md similarity index 100% rename from app/src/main/assets/help/ExtensionContentType.md rename to app/src/main/assets/web/help/md/ExtensionContentType.md diff --git a/app/src/main/assets/help/SourceMBookHelp.md b/app/src/main/assets/web/help/md/SourceMBookHelp.md similarity index 100% rename from app/src/main/assets/help/SourceMBookHelp.md rename to app/src/main/assets/web/help/md/SourceMBookHelp.md diff --git a/app/src/main/assets/help/SourceMRssHelp.md b/app/src/main/assets/web/help/md/SourceMRssHelp.md similarity index 100% rename from app/src/main/assets/help/SourceMRssHelp.md rename to app/src/main/assets/web/help/md/SourceMRssHelp.md diff --git a/app/src/main/assets/help/appHelp.md b/app/src/main/assets/web/help/md/appHelp.md similarity index 100% rename from app/src/main/assets/help/appHelp.md rename to app/src/main/assets/web/help/md/appHelp.md diff --git a/app/src/main/assets/help/debugHelp.md b/app/src/main/assets/web/help/md/debugHelp.md similarity index 100% rename from app/src/main/assets/help/debugHelp.md rename to app/src/main/assets/web/help/md/debugHelp.md diff --git a/app/src/main/assets/help/dictRuleHelp.md b/app/src/main/assets/web/help/md/dictRuleHelp.md similarity index 100% rename from app/src/main/assets/help/dictRuleHelp.md rename to app/src/main/assets/web/help/md/dictRuleHelp.md diff --git a/app/src/main/assets/help/httpTTSHelp.md b/app/src/main/assets/web/help/md/httpTTSHelp.md similarity index 100% rename from app/src/main/assets/help/httpTTSHelp.md rename to app/src/main/assets/web/help/md/httpTTSHelp.md diff --git a/app/src/main/assets/help/jsHelp.md b/app/src/main/assets/web/help/md/jsHelp.md similarity index 100% rename from app/src/main/assets/help/jsHelp.md rename to app/src/main/assets/web/help/md/jsHelp.md diff --git a/app/src/main/assets/help/readMenuHelp.md b/app/src/main/assets/web/help/md/readMenuHelp.md similarity index 100% rename from app/src/main/assets/help/readMenuHelp.md rename to app/src/main/assets/web/help/md/readMenuHelp.md diff --git a/app/src/main/assets/help/regexHelp.md b/app/src/main/assets/web/help/md/regexHelp.md similarity index 100% rename from app/src/main/assets/help/regexHelp.md rename to app/src/main/assets/web/help/md/regexHelp.md diff --git a/app/src/main/assets/help/replaceRuleHelp.md b/app/src/main/assets/web/help/md/replaceRuleHelp.md similarity index 100% rename from app/src/main/assets/help/replaceRuleHelp.md rename to app/src/main/assets/web/help/md/replaceRuleHelp.md diff --git a/app/src/main/assets/help/ruleHelp.md b/app/src/main/assets/web/help/md/ruleHelp.md similarity index 100% rename from app/src/main/assets/help/ruleHelp.md rename to app/src/main/assets/web/help/md/ruleHelp.md diff --git a/app/src/main/assets/help/txtTocRuleHelp.md b/app/src/main/assets/web/help/md/txtTocRuleHelp.md similarity index 100% rename from app/src/main/assets/help/txtTocRuleHelp.md rename to app/src/main/assets/web/help/md/txtTocRuleHelp.md diff --git a/app/src/main/assets/help/webDavBookHelp.md b/app/src/main/assets/web/help/md/webDavBookHelp.md similarity index 100% rename from app/src/main/assets/help/webDavBookHelp.md rename to app/src/main/assets/web/help/md/webDavBookHelp.md diff --git a/app/src/main/assets/help/webDavHelp.md b/app/src/main/assets/web/help/md/webDavHelp.md similarity index 100% rename from app/src/main/assets/help/webDavHelp.md rename to app/src/main/assets/web/help/md/webDavHelp.md diff --git a/app/src/main/assets/web/help/md/xpath.md b/app/src/main/assets/web/help/md/xpathHelp.md similarity index 100% rename from app/src/main/assets/web/help/md/xpath.md rename to app/src/main/assets/web/help/md/xpathHelp.md diff --git a/app/src/main/assets/web/src/rules.html b/app/src/main/assets/web/src/rules.html deleted file mode 100644 index afc411ded..000000000 --- a/app/src/main/assets/web/src/rules.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - -书源规则：从入门到入土 - - - -

Legado书源规则说明

作者: Celeter

更新时间: 2021-07-18

描述: 本说明是legado的规则说明，禁止其他未获得本人授权的第三方软件使用

概况

1、语法说明

2、Legado的特殊规则

3、书源之「基本」

4、书源之「搜索」

5、书源之「发现」

6、书源之「详情」

7、书源之「目录」

8、书源之「正文」

9、补充说明

- -
\ No newline at end of file diff --git a/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookActivity.kt index 17c19bb06..b18310818 100644 --- a/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookActivity.kt @@ -206,7 +206,7 @@ class RemoteBookActivity : BaseImportBookActivity(), @Suppress("SameParameterValue") private fun showHelp(fileName: String) { //显示目录help下的帮助文档 - val mdText = String(assets.open("help/${fileName}.md").readBytes()) + val mdText = String(assets.open("web/help/md/${fileName}.md").readBytes()) showDialogFragment(TextDialog(getString(R.string.help), mdText, TextDialog.Mode.MD)) } diff --git a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt index f60265717..dabe9a803 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt @@ -623,7 +623,7 @@ class BookSourceEditActivity : private fun showHelp(fileName: String) { //显示目录help下的帮助文档 - val mdText = String(assets.open("help/${fileName}.md").readBytes()) + val mdText = String(assets.open("web/help/md/${fileName}.md").readBytes()) showDialogFragment(TextDialog(getString(R.string.help), mdText, TextDialog.Mode.MD)) } diff --git a/app/src/main/java/io/legado/app/ui/replace/edit/ReplaceEditActivity.kt b/app/src/main/java/io/legado/app/ui/replace/edit/ReplaceEditActivity.kt index 71fd9a541..b85404db3 100644 --- a/app/src/main/java/io/legado/app/ui/replace/edit/ReplaceEditActivity.kt +++ b/app/src/main/java/io/legado/app/ui/replace/edit/ReplaceEditActivity.kt @@ -147,7 +147,7 @@ class ReplaceEditActivity : @Suppress("SameParameterValue") private fun showHelp(fileName: String) { //显示目录help下的帮助文档 - val mdText = String(assets.open("help/${fileName}.md").readBytes()) + val mdText = String(assets.open("web/help/md/${fileName}.md").readBytes()) showDialogFragment(TextDialog(getString(R.string.help), mdText, TextDialog.Mode.MD)) } diff --git a/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt index ec504ea02..3a83f54ac 100644 --- a/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt @@ -391,7 +391,7 @@ class RssSourceEditActivity : private fun showHelp(fileName: String) { //显示目录help下的帮助文档 - val mdText = String(assets.open("help/${fileName}.md").readBytes()) + val mdText = String(assets.open("web/help/md/${fileName}.md").readBytes()) showDialogFragment(TextDialog(getString(R.string.help), mdText, TextDialog.Mode.MD)) } diff --git a/modules/web/src/components/SourceHelp.vue b/modules/web/src/components/SourceHelp.vue index e0f3ba5ba..573eb6e64 100644 --- a/modules/web/src/components/SourceHelp.vue +++ b/modules/web/src/components/SourceHelp.vue @@ -2,16 +2,13 @@ import { Link } from "@element-plus/icons-vue";