diff --git a/app/src/main/assets/epub/chapter.html b/app/src/main/assets/epub/chapter.html
index 8503c3f97..6067f6649 100644
--- a/app/src/main/assets/epub/chapter.html
+++ b/app/src/main/assets/epub/chapter.html
@@ -1,6 +1,5 @@
-
+
Chapter
diff --git a/app/src/main/assets/epub/cover.html b/app/src/main/assets/epub/cover.html
index 268cc3f85..cb6df6353 100644
--- a/app/src/main/assets/epub/cover.html
+++ b/app/src/main/assets/epub/cover.html
@@ -1,6 +1,5 @@
-
+
Cover
diff --git a/app/src/main/assets/epub/intro.html b/app/src/main/assets/epub/intro.html
index 85eb28a63..5c64026f8 100644
--- a/app/src/main/assets/epub/intro.html
+++ b/app/src/main/assets/epub/intro.html
@@ -1,6 +1,5 @@
-
+
Intro
diff --git a/app/src/main/java/io/legado/app/model/localBook/EpubFile.kt b/app/src/main/java/io/legado/app/model/localBook/EpubFile.kt
index 062816b13..5365be900 100644
--- a/app/src/main/java/io/legado/app/model/localBook/EpubFile.kt
+++ b/app/src/main/java/io/legado/app/model/localBook/EpubFile.kt
@@ -30,10 +30,11 @@ class EpubFile(var book: Book) {
@Synchronized
private fun getEFile(book: Book): EpubFile {
BookHelp.getEpubFile(book)
- //对于Epub文件默认不启用替换
- book.setUseReplaceRule(false)
+
if (eFile == null || eFile?.book?.bookUrl != book.bookUrl) {
eFile = EpubFile(book)
+ //对于Epub文件默认不启用替换
+ book.setUseReplaceRule(false)
return eFile!!
}
eFile?.book = book
diff --git a/app/src/main/java/io/legado/app/ui/book/cache/CacheViewModel.kt b/app/src/main/java/io/legado/app/ui/book/cache/CacheViewModel.kt
index f89d997c3..81f866866 100644
--- a/app/src/main/java/io/legado/app/ui/book/cache/CacheViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/cache/CacheViewModel.kt
@@ -233,7 +233,7 @@ class CacheViewModel(application: Application) : BaseViewModel(application) {
}
private fun setAssets(doc: DocumentFile, book: Book, epubBook: EpubBook): String {
- if(!AppConfig.isGooglePlay) return setAssets(book, epubBook)
+ if(!(AppConfig.isGooglePlay|| appCtx.packageName.contains("debug",true))) return setAssets(book, epubBook)
var contentModel = ""
DocumentUtils.getDirDocument(doc, "Asset").let { customPath ->
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 011f56181..b617a26b5 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -764,8 +764,8 @@
导入
导出
保存主题配置
- 保存白天主题配置以共调用和分享
- 保存夜间主题配置以共调用和分享
+ 保存白天主题配置以供调用和分享
+ 保存夜间主题配置以供调用和分享
主题列表
使用保存主题,导入,分享主题
切换默认主题
diff --git a/epublib/src/main/java/me/ag2s/epublib/util/ResourceUtil.java b/epublib/src/main/java/me/ag2s/epublib/util/ResourceUtil.java
index f270bdbb3..853d1a5e4 100644
--- a/epublib/src/main/java/me/ag2s/epublib/util/ResourceUtil.java
+++ b/epublib/src/main/java/me/ag2s/epublib/util/ResourceUtil.java
@@ -43,17 +43,17 @@ public class ResourceUtil {
if (title.contains(""))
title = "" + title;
}
- String html = model.replaceAll("\\{title\\}", title)
- .replaceAll("\\{content\\}", StringUtil.formatHtml(txt));
+ String html = model.replace("{title}", title)
+ .replace("{content}", StringUtil.formatHtml(txt));
return new Resource(html.getBytes(), href);
}
public static Resource createPublicResource(String name, String author, String intro, String kind, String wordCount, String model, String href) {
- String html = model.replaceAll("\\{name\\}", name)
- .replaceAll("\\{author\\}", author)
- .replaceAll("\\{kind\\}", kind)
- .replaceAll("\\{wordCount\\}", wordCount)
- .replaceAll("\\{intro\\}", StringUtil.formatHtml(intro));
+ String html = model.replace("{name}", name)
+ .replace("{author}", author)
+ .replace("{kind}", kind)
+ .replace("{wordCount}", wordCount)
+ .replace("{intro}", StringUtil.formatHtml(intro));
return new Resource(html.getBytes(), href);
}