From 0a3e767d01bfe927d7303d937e924172c7b659fd Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Fri, 14 Jan 2022 20:32:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B9=A6=E6=BA=90=E7=BC=96=E8=BE=91=E6=98=BE?= =?UTF-8?q?=E7=A4=BApayAction=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/updateLog.md | 3 ++- app/src/main/assets/web/bookSource/index.html | 6 ++++++ .../app/ui/book/source/edit/BookSourceEditActivity.kt | 2 ++ app/src/main/res/values-es-rES/strings.xml | 1 + app/src/main/res/values-ja-rJP/strings.xml | 1 + app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values-zh/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 9 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/src/main/assets/updateLog.md b/app/src/main/assets/updateLog.md index f4a45e8fd..c7d195cc2 100644 --- a/app/src/main/assets/updateLog.md +++ b/app/src/main/assets/updateLog.md @@ -15,7 +15,8 @@ * 紧急修复在线tts朗读bug * 紧急修复登录问题 -* 添加isVolume规则,支持二级目录,页眉标题、正文标题显示优化 by Xwite +* 添加isVolume规则,支持二级目录,正文标题显示优化 by Xwite +* 书源编辑界面显示payAction规则 **2022/01/10** diff --git a/app/src/main/assets/web/bookSource/index.html b/app/src/main/assets/web/bookSource/index.html index b29d62842..3d07d0f6b 100644 --- a/app/src/main/assets/web/bookSource/index.html +++ b/app/src/main/assets/web/bookSource/index.html @@ -311,6 +311,12 @@ title="imageStyle" placeholder="FULL:铺满 不填:默认样式"> +
+
购买操作:
+ +

其它规则
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 9c30bbb4f..0a59dc75a 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 @@ -281,6 +281,7 @@ class BookSourceEditActivity : add(EditEntity("sourceRegex", cr?.sourceRegex, R.string.rule_source_regex)) add(EditEntity("replaceRegex", cr?.replaceRegex, R.string.rule_replace_regex)) add(EditEntity("imageStyle", cr?.imageStyle, R.string.rule_image_style)) + add(EditEntity("payAction", cr?.payAction, R.string.rule_pay_action)) } binding.tabLayout.selectTab(binding.tabLayout.getTabAt(0)) setEditEntities(0) @@ -376,6 +377,7 @@ class BookSourceEditActivity : "sourceRegex" -> contentRule.sourceRegex = it.value "replaceRegex" -> contentRule.replaceRegex = it.value "imageStyle" -> contentRule.imageStyle = it.value + "payAction" -> contentRule.payAction = it.value } } source.ruleSearch = searchRule diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 622e5e4ff..38fb6435c 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -423,6 +423,7 @@ 资源正则(sourceRegex) 替换规则(replaceRegex) 图片样式(imageStyle) + pay action(payAction) 图标(sourceIcon) 列表规则(ruleArticles) diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index 3a17a80eb..ed121ea77 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -427,6 +427,7 @@ 资源正则(sourceRegex) 替换规则(replaceRegex) 图片样式(imageStyle) + pay action(payAction) 图标(sourceIcon) 列表规则(ruleArticles) diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index a2e00281d..4ea4750da 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -420,6 +420,7 @@ 正文下一頁 URL 規則 (nextContentUrl) WebViewJs (webJs) 資源正則 (sourceRegex) + 购买操作(payAction) 圖標 (sourceIcon) 列表規則 (ruleArticles) 列表下一頁規則 (ruleArticles) diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index aac171aab..2c163ac5d 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -426,6 +426,7 @@ 圖片樣式(imageStyle) 取代規則(replaceRegex) 資源正則(sourceRegex) + 购买操作(payAction) 圖示(sourceIcon) 列表規則(ruleArticles) diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index fe9b236f3..bd023a0a0 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -426,6 +426,7 @@ 图片样式(imageStyle) 替换规则(replaceRegex) 资源正则(sourceRegex) + 购买操作(payAction) 图标(sourceIcon) 列表规则(ruleArticles) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e0ae17a7b..d88a10077 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -427,6 +427,7 @@ 资源正则(sourceRegex) 替换规则(replaceRegex) 图片样式(imageStyle) + 购买操作(payAction) 图标(sourceIcon) 列表规则(ruleArticles)