diff --git a/src/zh/baozimanhua/CHANGELOG.md b/src/zh/baozimanhua/CHANGELOG.md index 34af13a35..6898b261d 100644 --- a/src/zh/baozimanhua/CHANGELOG.md +++ b/src/zh/baozimanhua/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.3.12 (2022-07-23) + +- 适配章节分页的重叠区域,修复图片重复、缺页的问题 + ## 1.3.11 (2022-07-21) - 增加设置项:修复章节顺序错误导致的错标已读 diff --git a/src/zh/baozimanhua/build.gradle b/src/zh/baozimanhua/build.gradle index 165c40bb2..f109ac69d 100644 --- a/src/zh/baozimanhua/build.gradle +++ b/src/zh/baozimanhua/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'Baozi Manhua' pkgNameSuffix = 'zh.baozimanhua' extClass = '.Baozi' - extVersionCode = 11 + extVersionCode = 12 } apply from: "$rootDir/common.gradle" diff --git a/src/zh/baozimanhua/src/eu/kanade/tachiyomi/extension/zh/baozimanhua/Baozi.kt b/src/zh/baozimanhua/src/eu/kanade/tachiyomi/extension/zh/baozimanhua/Baozi.kt index 1f26249c1..75572c1f5 100644 --- a/src/zh/baozimanhua/src/eu/kanade/tachiyomi/extension/zh/baozimanhua/Baozi.kt +++ b/src/zh/baozimanhua/src/eu/kanade/tachiyomi/extension/zh/baozimanhua/Baozi.kt @@ -133,6 +133,7 @@ class Baozi : ParsedHttpSource(), ConfigurableSource { } override fun fetchPageList(chapter: SChapter): Observable> = Single.create> { + val pageNumberSelector = Evaluator.Class("comic-text__amp") val pageList = ArrayList(0) var url = baseUrl + chapter.url var pageCount = 0 @@ -140,11 +141,13 @@ class Baozi : ParsedHttpSource(), ConfigurableSource { do { val document = client.newCall(GET(url, headers)).execute().asJsoup() if (i == 0) { - pageCount = document.selectFirst(Evaluator.Class("comic-text__amp")) + pageCount = document.selectFirst(pageNumberSelector) ?.run { text().substringAfter('/').toInt() } ?: break pageList.ensureCapacity(pageCount) } - document.select(".comic-contain amp-img").mapTo(pageList) { element -> + document.select(".comic-contain amp-img").dropWhile { element -> + element.selectFirst(pageNumberSelector).text().substringBefore('/').toInt() <= i + }.mapTo(pageList) { element -> Page(i++, imageUrl = element.attr("src")) } url = document.selectFirst(Evaluator.Id("next-chapter"))?.attr("href") ?: break