Merge remote-tracking branch 'origin/master'

This commit is contained in:
kunfei
2022-11-04 13:40:59 +08:00
2 changed files with 4 additions and 7 deletions
@@ -119,9 +119,10 @@ class EpubFile(var book: Book) {
/** /**
* <image width="1038" height="670" xlink:href="..."/> * <image width="1038" height="670" xlink:href="..."/>
* ...titlepage.xhtml * ...titlepage.xhtml
* 大多数epub文件的封面页都会带有cover,可以一定程度上解决封面读取问题
*/ */
if (chapter.url.contains("titlepage.xhtml") || if (chapter.url.contains("titlepage.xhtml") ||
chapter.url.contains("cover.xhtml") chapter.url.contains("cover")
) { ) {
return "<img src=\"cover.jpeg\" />" return "<img src=\"cover.jpeg\" />"
} }
@@ -123,9 +123,7 @@ class CacheViewModel(application: Application) : BaseViewModel(application) {
exportMsg[book.bookUrl] = context.getString(R.string.export_success) exportMsg[book.bookUrl] = context.getString(R.string.export_success)
upAdapterLiveData.postValue(book.bookUrl) upAdapterLiveData.postValue(book.bookUrl)
}.onFinally { }.onFinally {
mutex.withLock { exportNumber--
exportNumber--
}
} }
} }
@@ -288,9 +286,7 @@ class CacheViewModel(application: Application) : BaseViewModel(application) {
exportMsg[book.bookUrl] = context.getString(R.string.export_success) exportMsg[book.bookUrl] = context.getString(R.string.export_success)
upAdapterLiveData.postValue(book.bookUrl) upAdapterLiveData.postValue(book.bookUrl)
}.onFinally { }.onFinally {
mutex.withLock { exportNumber--
exportNumber--
}
} }
} }