From c24a7670ee5a1e10f6eee53e89d5258b607c3710 Mon Sep 17 00:00:00 2001 From: gedoor Date: Tue, 27 Jul 2021 16:04:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/web/uploadBook/js/common.js | 5 ----- app/src/main/assets/web/uploadBook/js/html5_fun.js | 1 + .../main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt | 2 +- epublib/src/main/java/me/ag2s/epublib/util/StringUtil.java | 7 +++---- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/app/src/main/assets/web/uploadBook/js/common.js b/app/src/main/assets/web/uploadBook/js/common.js index 4b9674445..b7735b331 100644 --- a/app/src/main/assets/web/uploadBook/js/common.js +++ b/app/src/main/assets/web/uploadBook/js/common.js @@ -89,11 +89,6 @@ function checkFile(file) { return null; } - - - - - /** * 添加文件时,回调的函数 * @param object file 文件对象 diff --git a/app/src/main/assets/web/uploadBook/js/html5_fun.js b/app/src/main/assets/web/uploadBook/js/html5_fun.js index 806dadc4a..da497326e 100644 --- a/app/src/main/assets/web/uploadBook/js/html5_fun.js +++ b/app/src/main/assets/web/uploadBook/js/html5_fun.js @@ -129,6 +129,7 @@ try { fd.append("Upload", "Submit Query"); //设置当前的上传对象 currUploadfile = file; + if (XHR.readyState > 0) { XHR = new XMLHttpRequest(); } diff --git a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt index 066cf6219..04d0d9899 100644 --- a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt @@ -107,7 +107,6 @@ class ReadRssActivity : VMBaseActivity mixedContentMode = WebSettings.MIXED_CONTENT_ALWAYS_ALLOW domStorageEnabled = true allowContentAccess = true - //javaScriptEnabled = true } binding.webView.addJavascriptInterface(this, "app") upWebViewTheme() @@ -162,6 +161,7 @@ class ReadRssActivity : VMBaseActivity viewModel.saveImage(webPic, path) } } + private fun selectExportFolder() { val default = arrayListOf() val path = ACache.get(this@ReadRssActivity).getAsString(imagePathKey) diff --git a/epublib/src/main/java/me/ag2s/epublib/util/StringUtil.java b/epublib/src/main/java/me/ag2s/epublib/util/StringUtil.java index b989afb24..e9fff3136 100644 --- a/epublib/src/main/java/me/ag2s/epublib/util/StringUtil.java +++ b/epublib/src/main/java/me/ag2s/epublib/util/StringUtil.java @@ -3,8 +3,6 @@ package me.ag2s.epublib.util; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; /** * Various String utility functions. @@ -281,8 +279,9 @@ public class StringUtil { if (s.length() > 0) { //段落为一张图片才认定为图片章节/漫画并启用多看单图优化,否则认定为普通文字夹杂着的图片文字。 if (s.matches("(?i)^]+)/?>$")) { - body.append(s.replaceAll("(?i)^]+)/?>$", "
")); } - else{ + body.append(s.replaceAll("(?i)^]+)/?>$", + "
")); + } else { body.append("

").append(s).append("

"); } }