Horis 1 سال پیش
والد
کامیت
449c76fd13

+ 2 - 2
app/src/main/assets/web/help/md/jsHelp.md

@@ -112,8 +112,8 @@ java.getWebViewUA(): String
 * 网络请求
 * 网络请求
 ```js
 ```js
 java.ajax(urlStr): String
 java.ajax(urlStr): String
-java.ajaxAll(urlList: Array<String>): Array<StrResponse?>
-//返回Response 方法body() code() message() header() raw() toString() 
+java.ajaxAll(urlList: Array<String>): Array<StrResponse>
+//返回StrResponse 方法body() code() message() headers() raw() toString() 
 java.connect(urlStr): StrResponse
 java.connect(urlStr): StrResponse
 
 
 java.post(url: String, body: String, headerMap: Map<String, String>): Connection.Response
 java.post(url: String, body: String, headerMap: Map<String, String>): Connection.Response

+ 3 - 0
app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt

@@ -528,6 +528,9 @@ class AnalyzeUrl(
     }
     }
 
 
     private fun getByteArrayIfDataUri(): ByteArray? {
     private fun getByteArrayIfDataUri(): ByteArray? {
+        if (!urlNoQuery.startsWith("data:")) {
+            return null
+        }
         val dataUriFindResult = dataUriRegex.find(urlNoQuery)
         val dataUriFindResult = dataUriRegex.find(urlNoQuery)
         if (dataUriFindResult != null) {
         if (dataUriFindResult != null) {
             val dataUriBase64 = dataUriFindResult.groupValues[1]
             val dataUriBase64 = dataUriFindResult.groupValues[1]

+ 2 - 0
app/src/main/java/io/legado/app/ui/book/read/SearchMenu.kt

@@ -139,6 +139,7 @@ class SearchMenu @JvmOverloads constructor(
         //主菜单
         //主菜单
         llMainMenu.setOnClickListener {
         llMainMenu.setOnClickListener {
             runMenuOut {
             runMenuOut {
+                callBack.cancelSelect()
                 callBack.showMenuBar()
                 callBack.showMenuBar()
                 this@SearchMenu.invisible()
                 this@SearchMenu.invisible()
             }
             }
@@ -246,6 +247,7 @@ class SearchMenu @JvmOverloads constructor(
         fun navigateToSearch(searchResult: SearchResult, index: Int)
         fun navigateToSearch(searchResult: SearchResult, index: Int)
         fun onMenuShow()
         fun onMenuShow()
         fun onMenuHide()
         fun onMenuHide()
+        fun cancelSelect()
     }
     }
 
 
 }
 }