mirror of
https://github.com/gedoor/legado.git
synced 2024-07-06 23:47:49 +08:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
caedb5ea47
@ -139,6 +139,7 @@ class EpubFile(var book: Book) {
|
||||
epubBook?.let { epubBook ->
|
||||
val nextChapterFirstResourceHref = chapter.getVariable("nextUrl")?.substringBeforeLast("#")
|
||||
val currentChapterFirstResourceHref = chapter.url.substringBeforeLast("#")
|
||||
val isLastChapter = nextChapterFirstResourceHref.isNullOrBlank()
|
||||
val startFragmentId = chapter.startFragmentId
|
||||
val endFragmentId = chapter.endFragmentId
|
||||
val elements = Elements()
|
||||
@ -154,8 +155,8 @@ class EpubFile(var book: Book) {
|
||||
elements.add(
|
||||
getBody(res, startFragmentId, endFragmentId)
|
||||
)
|
||||
// 是否继续遍历
|
||||
if (currentChapterFirstResourceHref == nextChapterFirstResourceHref) break
|
||||
// 不是最后章节 且 已经遍历到下一章节的内容时停止
|
||||
if (!isLastChapter && res.href == nextChapterFirstResourceHref) break
|
||||
continue
|
||||
}
|
||||
if (nextChapterFirstResourceHref != res.href) {
|
||||
|
@ -137,6 +137,8 @@ class BookInfoActivity :
|
||||
viewModel.bookData.value?.isLocalTxt ?: false
|
||||
menu.findItem(R.id.menu_upload)?.isVisible =
|
||||
viewModel.bookData.value?.isLocal ?: false
|
||||
menu.findItem(R.id.menu_edit)?.isVisible =
|
||||
!viewModel.bookData.value?.isWebFile ?: true
|
||||
return super.onMenuOpened(featureId, menu)
|
||||
}
|
||||
|
||||
|
@ -4,6 +4,7 @@
|
||||
<item>Texto</item>
|
||||
<item>Audio</item>
|
||||
<item>Image</item>
|
||||
<item>File</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="group_style">
|
||||
|
@ -4,6 +4,7 @@
|
||||
<item>Texto</item>
|
||||
<item>Áudio</item>
|
||||
<item>Image</item>
|
||||
<item>File</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="group_style">
|
||||
|
@ -5,6 +5,7 @@
|
||||
<item>文本</item>
|
||||
<item>音頻</item>
|
||||
<item>图片</item>
|
||||
<item>文件</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="group_style">
|
||||
|
@ -4,6 +4,7 @@
|
||||
<item>文字</item>
|
||||
<item>音訊</item>
|
||||
<item>圖片</item>
|
||||
<item>資料</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="group_style">
|
||||
|
@ -4,6 +4,7 @@
|
||||
<item>文本</item>
|
||||
<item>音频</item>
|
||||
<item>图片</item>
|
||||
<item>文件</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="group_style">
|
||||
|
@ -9,6 +9,7 @@
|
||||
<item>Text</item>
|
||||
<item>Audio</item>
|
||||
<item>Image</item>
|
||||
<item>File</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="group_style">
|
||||
|
Loading…
Reference in New Issue
Block a user