diff --git a/app/src/main/java/io/legado/app/model/webBook/BookChapterList.kt b/app/src/main/java/io/legado/app/model/webBook/BookChapterList.kt index 008ad3d6c..706de5022 100644 --- a/app/src/main/java/io/legado/app/model/webBook/BookChapterList.kt +++ b/app/src/main/java/io/legado/app/model/webBook/BookChapterList.kt @@ -204,24 +204,8 @@ object BookChapterList { ): ChapterData> { val analyzeRule = AnalyzeRule(book) analyzeRule.setContent(body).setBaseUrl(baseUrl) + //获取目录列表 val chapterList = arrayListOf() - val nextUrlList = arrayListOf() - val nextTocRule = tocRule.nextTocUrl - if (getNextUrl && !nextTocRule.isNullOrEmpty()) { - Debug.log(bookSource.bookSourceUrl, "┌获取目录下一页列表", log) - analyzeRule.getStringList(nextTocRule, true)?.let { - for (item in it) { - if (item != baseUrl) { - nextUrlList.add(item) - } - } - } - Debug.log( - bookSource.bookSourceUrl, - "└" + TextUtils.join(",\n", nextUrlList), - log - ) - } Debug.log(bookSource.bookSourceUrl, "┌获取目录列表", log) val elements = analyzeRule.getElements(listRule) Debug.log(bookSource.bookSourceUrl, "└列表大小:${elements.size}", log) @@ -258,6 +242,24 @@ object BookChapterList { Debug.log(bookSource.bookSourceUrl, "┌获取首章信息", log) Debug.log(bookSource.bookSourceUrl, "└${chapterList[0].tag}", log) } + //获取下一页链接 + val nextUrlList = arrayListOf() + val nextTocRule = tocRule.nextTocUrl + if (getNextUrl && !nextTocRule.isNullOrEmpty()) { + Debug.log(bookSource.bookSourceUrl, "┌获取目录下一页列表", log) + analyzeRule.getStringList(nextTocRule, true)?.let { + for (item in it) { + if (item != baseUrl) { + nextUrlList.add(item) + } + } + } + Debug.log( + bookSource.bookSourceUrl, + "└" + TextUtils.join(",\n", nextUrlList), + log + ) + } return ChapterData(chapterList, nextUrlList) } diff --git a/app/src/main/java/io/legado/app/model/webBook/BookContent.kt b/app/src/main/java/io/legado/app/model/webBook/BookContent.kt index 77069b178..265035e1c 100644 --- a/app/src/main/java/io/legado/app/model/webBook/BookContent.kt +++ b/app/src/main/java/io/legado/app/model/webBook/BookContent.kt @@ -121,6 +121,9 @@ object BookContent { analyzeRule.setContent(body).setBaseUrl(baseUrl) val nextUrlList = arrayListOf() analyzeRule.chapter = chapter + //获取正文 + val content = analyzeRule.getString(contentRule.content) + //获取下一页链接 val nextUrlRule = contentRule.nextContentUrl if (!nextUrlRule.isNullOrEmpty()) { Debug.log(bookSource.bookSourceUrl, "┌获取正文下一页链接", printLog) @@ -129,7 +132,6 @@ object BookContent { } Debug.log(bookSource.bookSourceUrl, "└" + nextUrlList.joinToString(","), printLog) } - val content = analyzeRule.getString(contentRule.content) return ContentData(content, nextUrlList) } } \ No newline at end of file