diff --git a/app/src/main/assets/web/help/md/jsHelp.md b/app/src/main/assets/web/help/md/jsHelp.md index b5f6b9b2a..4f0e03e97 100644 --- a/app/src/main/assets/web/help/md/jsHelp.md +++ b/app/src/main/assets/web/help/md/jsHelp.md @@ -112,8 +112,8 @@ java.getWebViewUA(): String * 网络请求 ```js java.ajax(urlStr): String -java.ajaxAll(urlList: Array): Array -//返回Response 方法body() code() message() header() raw() toString() +java.ajaxAll(urlList: Array): Array +//返回StrResponse 方法body() code() message() headers() raw() toString() java.connect(urlStr): StrResponse java.post(url: String, body: String, headerMap: Map): Connection.Response diff --git a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt index d323837d1..1d450b631 100644 --- a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt +++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt @@ -528,6 +528,9 @@ class AnalyzeUrl( } private fun getByteArrayIfDataUri(): ByteArray? { + if (!urlNoQuery.startsWith("data:")) { + return null + } val dataUriFindResult = dataUriRegex.find(urlNoQuery) if (dataUriFindResult != null) { val dataUriBase64 = dataUriFindResult.groupValues[1] diff --git a/app/src/main/java/io/legado/app/ui/book/read/SearchMenu.kt b/app/src/main/java/io/legado/app/ui/book/read/SearchMenu.kt index 9993141ea..6e4f1ff2c 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/SearchMenu.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/SearchMenu.kt @@ -139,6 +139,7 @@ class SearchMenu @JvmOverloads constructor( //主菜单 llMainMenu.setOnClickListener { runMenuOut { + callBack.cancelSelect() callBack.showMenuBar() this@SearchMenu.invisible() } @@ -246,6 +247,7 @@ class SearchMenu @JvmOverloads constructor( fun navigateToSearch(searchResult: SearchResult, index: Int) fun onMenuShow() fun onMenuHide() + fun cancelSelect() } }