NativeObject

支持##

app/src/main/assets/updateLog.md

@@ -18,7 +18,7 @@
 * 修复bug
 * 详情页下拉刷新
 * 导出为本地文件时不保留vip标识
-* 列表结果为NativeObject时支持{{}}@get@put规则
+* 列表结果为NativeObject时支持{{}}@get@put##规则
 ```
 {bookId: 1}
 https://www.example.com/book/{{result.bookId}}

app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt

@@ -144,12 +144,14 @@ class AnalyzeRule(
             result = content
             if (result is NativeObject) {
                 val sourceRule = ruleList.first()
+                putRule(sourceRule.putMap)
+                sourceRule.makeUpRule(result)
                 result = if (sourceRule.getParamSize() > 1) {
-                    putRule(sourceRule.putMap)
-                    sourceRule.makeUpRule(result)
                     result[sourceRule.rule]?.toString() ?: sourceRule.rule
                 } else {
                     result[sourceRule.rule]?.toString()
+                }?.let {
+                    replaceRegex(it.toString(), sourceRule)
                 }
             } else {
                 for (sourceRule in ruleList) {
@@ -227,12 +229,14 @@ class AnalyzeRule(
             result = content
             if (result is NativeObject) {
                 val sourceRule = ruleList.first()
+                putRule(sourceRule.putMap)
+                sourceRule.makeUpRule(result)
                 result = if (sourceRule.getParamSize() > 1) {
-                    putRule(sourceRule.putMap)
-                    sourceRule.makeUpRule(result)
                     result[sourceRule.rule]?.toString() ?: sourceRule.rule
                 } else {
                     result[sourceRule.rule]?.toString()
+                }?.let {
+                    replaceRegex(it.toString(), sourceRule)
                 }
             } else {
                 for (sourceRule in ruleList) {