pull/1181/head
gedoor 4 years ago
parent 663a029317
commit c24a7670ee
  1. 5
      app/src/main/assets/web/uploadBook/js/common.js
  2. 1
      app/src/main/assets/web/uploadBook/js/html5_fun.js
  3. 2
      app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt
  4. 7
      epublib/src/main/java/me/ag2s/epublib/util/StringUtil.java

@ -89,11 +89,6 @@ function checkFile(file) {
return null; return null;
} }
/** /**
* 添加文件时回调的函数 * 添加文件时回调的函数
* @param object file 文件对象 * @param object file 文件对象

@ -129,6 +129,7 @@ try {
fd.append("Upload", "Submit Query"); fd.append("Upload", "Submit Query");
//设置当前的上传对象 //设置当前的上传对象
currUploadfile = file; currUploadfile = file;
if (XHR.readyState > 0) { if (XHR.readyState > 0) {
XHR = new XMLHttpRequest(); XHR = new XMLHttpRequest();
} }

@ -107,7 +107,6 @@ class ReadRssActivity : VMBaseActivity<ActivityRssReadBinding, ReadRssViewModel>
mixedContentMode = WebSettings.MIXED_CONTENT_ALWAYS_ALLOW mixedContentMode = WebSettings.MIXED_CONTENT_ALWAYS_ALLOW
domStorageEnabled = true domStorageEnabled = true
allowContentAccess = true allowContentAccess = true
//javaScriptEnabled = true
} }
binding.webView.addJavascriptInterface(this, "app") binding.webView.addJavascriptInterface(this, "app")
upWebViewTheme() upWebViewTheme()
@ -162,6 +161,7 @@ class ReadRssActivity : VMBaseActivity<ActivityRssReadBinding, ReadRssViewModel>
viewModel.saveImage(webPic, path) viewModel.saveImage(webPic, path)
} }
} }
private fun selectExportFolder() { private fun selectExportFolder() {
val default = arrayListOf<String>() val default = arrayListOf<String>()
val path = ACache.get(this@ReadRssActivity).getAsString(imagePathKey) val path = ACache.get(this@ReadRssActivity).getAsString(imagePathKey)

@ -3,8 +3,6 @@ package me.ag2s.epublib.util;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/** /**
* Various String utility functions. * Various String utility functions.
@ -281,8 +279,9 @@ public class StringUtil {
if (s.length() > 0) { if (s.length() > 0) {
//段落为一张图片才认定为图片章节/漫画并启用多看单图优化,否则认定为普通文字夹杂着的图片文字。 //段落为一张图片才认定为图片章节/漫画并启用多看单图优化,否则认定为普通文字夹杂着的图片文字。
if (s.matches("(?i)^<img\\s([^>]+)/?>$")) { if (s.matches("(?i)^<img\\s([^>]+)/?>$")) {
body.append(s.replaceAll("(?i)^<img\\s([^>]+)/?>$", "<div class=\"duokan-image-single\"><img class=\"picture-80\" $1/></div>")); } body.append(s.replaceAll("(?i)^<img\\s([^>]+)/?>$",
else{ "<div class=\"duokan-image-single\"><img class=\"picture-80\" $1/></div>"));
} else {
body.append("<p>").append(s).append("</p>"); body.append("<p>").append(s).append("</p>");
} }
} }

Loading…
Cancel
Save