Merge pull request #1949 from Xwite/master

fix(epub): titlepage.xhtml location
3 years ago · a923c2a9e4
parent a15ce01ef6 05581c30c3
commit a923c2a9e4
2 changed files with 5 additions and 5 deletions
--- a/app/src/main/java/io/legado/app/model/localBook/EpubFile.kt
+++ b/app/src/main/java/io/legado/app/model/localBook/EpubFile.kt
@ -122,11 +122,10 @@ class EpubFile(var book: Book) {

    private fun getContent(chapter: BookChapter): String? {
         /**
-          * <image width="1038" height="670" xlink:href="cover.jpeg"/>
-          * <img width="1038" height="670" src="cover.jpeg"/>
-          * titlepage.xhtml
+          * <image width="1038" height="670" xlink:href="..."/>
+          * ...titlepage.xhtml
          */
-        if (chapter.url == "titlepage.xhtml") {
+        if (chapter.url.contains("titlepage.xhtml")) {
            return "<img src=\"cover.jpeg\" />"
        }
        /*获取当前章节文本*/
--- a/app/src/main/java/io/legado/app/model/localBook/LocalBook.kt
+++ b/app/src/main/java/io/legado/app/model/localBook/LocalBook.kt
@ -76,7 +76,8 @@ object LocalBook {
        if (chapters.isEmpty()) {
            throw TocEmptyException(appCtx.getString(R.string.chapter_list_empty))
        }
-        return chapters
+        val lh = LinkedHashSet(chapters)
+        return ArrayList(lh)
    }

    fun getContent(book: Book, chapter: BookChapter): String? {