|
|
@ -267,8 +267,8 @@ class AnalyzeRule( |
|
|
|
var result: Any? = null |
|
|
|
var result: Any? = null |
|
|
|
val content = mContent ?: this.content |
|
|
|
val content = mContent ?: this.content |
|
|
|
val ruleList = splitSourceRule(ruleStr, true) |
|
|
|
val ruleList = splitSourceRule(ruleStr, true) |
|
|
|
content?.let { o -> |
|
|
|
if (content != null && ruleList.isNotEmpty()) { |
|
|
|
if (ruleList.isNotEmpty()) result = o |
|
|
|
result = content |
|
|
|
for (sourceRule in ruleList) { |
|
|
|
for (sourceRule in ruleList) { |
|
|
|
putRule(sourceRule.putMap) |
|
|
|
putRule(sourceRule.putMap) |
|
|
|
sourceRule.makeUpRule(result) |
|
|
|
sourceRule.makeUpRule(result) |
|
|
@ -300,8 +300,8 @@ class AnalyzeRule( |
|
|
|
var result: Any? = null |
|
|
|
var result: Any? = null |
|
|
|
val content = mContent ?: this.content |
|
|
|
val content = mContent ?: this.content |
|
|
|
val ruleList = splitSourceRule(ruleStr, true) |
|
|
|
val ruleList = splitSourceRule(ruleStr, true) |
|
|
|
content?.let { o -> |
|
|
|
if (content != null && ruleList.isNotEmpty()) { |
|
|
|
if (ruleList.isNotEmpty()) result = o |
|
|
|
result = content |
|
|
|
for (sourceRule in ruleList) { |
|
|
|
for (sourceRule in ruleList) { |
|
|
|
putRule(sourceRule.putMap) |
|
|
|
putRule(sourceRule.putMap) |
|
|
|
result?.let { |
|
|
|
result?.let { |
|
|
|