From 6a01dba5039348a2e380bbdeefd6f626e7f13e37 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Fri, 28 Jun 2019 16:51:55 +0800
Subject: [PATCH] up

---
 .../app/model/analyzeRule/AnalyzeRule.kt      | 50 +++++++++++--------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt
index 5affcb76f..ccea22947 100644
--- a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt
+++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt
@@ -317,14 +317,16 @@ class AnalyzeRule(private var book: BaseBook? = null) {
         if (TextUtils.isEmpty(vRuleStr)) return ruleList
         //检测Mode
         val mode: Mode
-        if (vRuleStr.startsWith("@XPath:", true)) {
-            mode = Mode.XPath
-            vRuleStr = vRuleStr.substring(7)
-        } else if (vRuleStr.startsWith("@JSon:", true)) {
-            mode = Mode.JSon
-            vRuleStr = vRuleStr.substring(6)
-        } else {
-            mode = if (isJSON!!) {
+        when {
+            vRuleStr.startsWith("@XPath:", true) -> {
+                mode = Mode.XPath
+                vRuleStr = vRuleStr.substring(7)
+            }
+            vRuleStr.startsWith("@JSon:", true) -> {
+                mode = Mode.JSon
+                vRuleStr = vRuleStr.substring(6)
+            }
+            else -> mode = if (isJSON!!) {
                 Mode.JSon
             } else {
                 Mode.Default
@@ -375,20 +377,24 @@ class AnalyzeRule(private var book: BaseBook? = null) {
                     rule = ruleStr.substring(4)
                 }
             } else {
-                if (ruleStr.startsWith("@XPath:", true)) {
-                    mode = Mode.XPath
-                    rule = ruleStr.substring(7)
-                } else if (ruleStr.startsWith("//")) {//XPath特征很明显,无需配置单独的识别标头
-                    mode = Mode.XPath
-                    rule = ruleStr
-                } else if (ruleStr.startsWith("@JSon:", true)) {
-                    mode = Mode.JSon
-                    rule = ruleStr.substring(6)
-                } else if (ruleStr.startsWith("$.")) {
-                    mode = Mode.JSon
-                    rule = ruleStr
-                } else {
-                    rule = ruleStr
+                when {
+                    ruleStr.startsWith("@XPath:", true) -> {
+                        mode = Mode.XPath
+                        rule = ruleStr.substring(7)
+                    }
+                    ruleStr.startsWith("//") -> {//XPath特征很明显,无需配置单独的识别标头
+                        mode = Mode.XPath
+                        rule = ruleStr
+                    }
+                    ruleStr.startsWith("@JSon:", true) -> {
+                        mode = Mode.JSon
+                        rule = ruleStr.substring(6)
+                    }
+                    ruleStr.startsWith("$.") -> {
+                        mode = Mode.JSon
+                        rule = ruleStr
+                    }
+                    else -> rule = ruleStr
                 }
             }
         }