pull/32/head
kunfei 5 years ago
parent cc7816949f
commit 190eb6eff5
  1. 8
      app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSonPath.kt
  2. 4
      app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSoup.kt
  3. 8
      app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByXPath.kt

@ -62,17 +62,17 @@ class AnalyzeByJSonPath {
return result return result
} }
} else { } else {
val sb = StringBuilder() val textList = arrayListOf<String>()
for (rl in rules) { for (rl in rules) {
val temp = getString(rl) val temp = getString(rl)
if (!TextUtils.isEmpty(temp)) { if (!temp.isNullOrEmpty()) {
sb.append(temp) textList.add(temp)
if (elementsType == "|") { if (elementsType == "|") {
break break
} }
} }
} }
return sb.toString() return TextUtils.join(",", textList)
} }
} }

@ -75,7 +75,7 @@ class AnalyzeByJSoup {
//拆分规则 //拆分规则
val sourceRule = SourceRule(ruleStr) val sourceRule = SourceRule(ruleStr)
if (isEmpty(sourceRule.elementsRule)) { if (isEmpty(sourceRule.elementsRule)) {
textS.add(element!!.data()) textS.add(element?.data() ?: "")
} else { } else {
val elementsType: String val elementsType: String
val ruleStrS: Array<String> val ruleStrS: Array<String>
@ -105,7 +105,7 @@ class AnalyzeByJSoup {
} else { } else {
getResultList(ruleStrX) getResultList(ruleStrX)
} }
if (temp != null && temp.isNotEmpty()) { if (!temp.isNullOrEmpty()) {
results.add(temp) results.add(temp)
if (results.isNotEmpty() && elementsType == "|") { if (results.isNotEmpty() && elementsType == "|") {
break break

@ -154,17 +154,17 @@ class AnalyzeByXPath {
} }
return null return null
} else { } else {
val sb = StringBuilder() val textList = arrayListOf<String>()
for (rl in rules) { for (rl in rules) {
val temp = getString(rl) val temp = getString(rl)
if (!TextUtils.isEmpty(temp)) { if (!temp.isNullOrEmpty()) {
sb.append(temp) textList.add(temp)
if (elementsType == "|") { if (elementsType == "|") {
break break
} }
} }
} }
return sb.toString() return TextUtils.join(",", textList)
} }
} }
} }

Loading…
Cancel
Save