优化
This commit is contained in:
@@ -296,7 +296,7 @@ object ReadManga : CoroutineScope by MainScope() {
|
|||||||
nextMangaChapter?.let {
|
nextMangaChapter?.let {
|
||||||
list.addAll(it.contents)
|
list.addAll(it.contents)
|
||||||
}
|
}
|
||||||
return MangaContentData(pos, list, curMangaChapter != null)
|
return MangaContentData(pos, list, curMangaChapter != null, nextMangaChapter != null)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -261,9 +261,10 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
|
|||||||
val data = withContext(IO) { ReadManga.mangaContents }
|
val data = withContext(IO) { ReadManga.mangaContents }
|
||||||
val pos = data.pos
|
val pos = data.pos
|
||||||
val list = data.contents
|
val list = data.contents
|
||||||
val finish = data.finish
|
val curFinish = data.curFinish
|
||||||
|
val nextFinish = data.nextFinish
|
||||||
mAdapter.submitList(list) {
|
mAdapter.submitList(list) {
|
||||||
if (loadingViewVisible && finish) {
|
if (loadingViewVisible && curFinish) {
|
||||||
binding.infobar.isVisible = true
|
binding.infobar.isVisible = true
|
||||||
upInfoBar(
|
upInfoBar(
|
||||||
ReadManga.durChapterIndex,
|
ReadManga.durChapterIndex,
|
||||||
@@ -277,10 +278,13 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
|
|||||||
loadMoreView.visible()
|
loadMoreView.visible()
|
||||||
}
|
}
|
||||||
|
|
||||||
if (finish) {
|
if (curFinish) {
|
||||||
loadMoreView.stopLoad()
|
|
||||||
if (!ReadManga.hasNextChapter) {
|
if (!ReadManga.hasNextChapter) {
|
||||||
loadMoreView.noMore("暂无章节了!")
|
loadMoreView.noMore("暂无章节了!")
|
||||||
|
} else if (nextFinish) {
|
||||||
|
loadMoreView.stopLoad()
|
||||||
|
} else {
|
||||||
|
loadMoreView.startLoad()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,5 +3,6 @@ package io.legado.app.ui.book.manga.entities
|
|||||||
data class MangaContentData(
|
data class MangaContentData(
|
||||||
val pos: Int,
|
val pos: Int,
|
||||||
val contents: List<Any>,
|
val contents: List<Any>,
|
||||||
val finish: Boolean
|
val curFinish: Boolean,
|
||||||
|
val nextFinish: Boolean
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user