Merge remote-tracking branch 'origin/master' into master

# Conflicts:
#	app/src/main/java/io/legado/app/utils/HtmlFormatter.kt

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

@@ -597,13 +597,9 @@ class AnalyzeRule(val ruleData: RuleDataInterface) : JsExtensions {
 
         private fun isRule(ruleStr: String): Boolean {
             return ruleStr.startsWith('@') //js首个字符不可能是@，除非是装饰器，所以@开头规定为规则
-                    || ruleStr.startsWith('$') //js首个字符不可能是$，因为并未注入$变量，且$1之类的东西已被替换，不会影响此处判断
+                    || ruleStr.startsWith("$.")
+                    || ruleStr.startsWith("$[")
                     || ruleStr.startsWith("//")
-                    || ruleStr.startsWith("class")//js首个字符串不可能是class，因为并未注入相关字符串开头的变量
-                    || ruleStr.startsWith("id")//js首个字符串不可能是id，因为并未注入相关字符串开头的变量
-                    || ruleStr.startsWith("tag")//js首个字符串不可能是tag，因为并未注入相关字符串开头的变量
-                    || ruleStr.startsWith("text")//js首个字符串不可能是text，因为并未注入相关字符串开头的变量
-                    || ruleStr.startsWith("children")//js首个字符串不可能是children，因为并未注入相关字符串开头的变量
         }
     }
 

app/src/main/java/io/legado/app/utils/HtmlFormatter.kt

@@ -44,24 +44,10 @@ object HtmlFormatter {
         val matcher = imgPattern.matcher(keepImgHtml)
         var appendPos = 0
 
-        if(matcher.find()){
-            if(hasDataType || matcher.group(1)!!.indexOf(',') == -1) { //图片无参
-
-                do{
-                    sb.append(keepImgHtml.substring(appendPos, matcher.start()).replace("\n","\n　　")) //非图片部分换行缩进
-                    sb.append( "<img src=\"${
-                        NetworkUtils.getAbsoluteURL(redirectUrl,matcher.group(1)!!)
-                    }\">" )
-                    appendPos = matcher.end()
-                }while (matcher.find())
-
-            }else{ //图片有参
-
-                do{
+        while(matcher.find()){
             val url = matcher.group(1)!!
             val urlBefore = url.substringBefore(',')
-                    val beforeStr = keepImgHtml.substring(appendPos, matcher.start())
-                    sb.append( if(beforeStr == "\n") '\n' else beforeStr.replace("\n","\n　　") ) //缩进换行下个非图片段落
+            sb.append( keepImgHtml.substring(appendPos, matcher.start()).replace("\n","\n　　") ) //缩进换行下个非图片段落
             sb.append(
                     "<img src=\"${
                         NetworkUtils.getAbsoluteURL(
@@ -73,14 +59,10 @@ object HtmlFormatter {
                     }\">"
             )
             appendPos = matcher.end()
-                }while(matcher.find())
-
-            }
         }
 
         if (appendPos < keepImgHtml.length) {
-            val beforeStr = keepImgHtml.substring(appendPos, keepImgHtml.length)
-            sb.append( if(beforeStr == "\n") '\n' else beforeStr.replace("\n","\n　　") ) //缩进换行下个非图片段落
+            sb.append( keepImgHtml.substring( appendPos, keepImgHtml.length ).replace("\n","\n　　") ) //缩进换行下个非图片段落
         }
         return sb.toString()
     }