Merge pull request #2287 from 821938089/little-fix

一些优化
This commit is contained in:
kunfei
2022-09-16 08:48:02 +08:00
committed by GitHub
3 changed files with 6 additions and 2 deletions

View File

@@ -139,6 +139,9 @@ object BookHelp {
var bytes = analyzeUrl.getByteArrayAwait()
//某些图片被加密,需要进一步解密
bookSource?.getContentRule()?.imageDecode?.let {
if (it.isBlank()) {
return@let
}
kotlin.runCatching {
bookSource.evalJS(it) {
put("book", book)

View File

@@ -17,8 +17,9 @@ class VerificationCodeActivity :
override fun onActivityCreated(savedInstanceState: Bundle?) {
intent.getStringExtra("imageUrl")?.let {
val sourceOrigin = intent.getStringExtra("sourceOrigin")
val sourceName = intent.getStringExtra("sourceName")
showDialogFragment(
VerificationCodeDialog(it, sourceOrigin)
VerificationCodeDialog(it, sourceOrigin, sourceName)
)
} ?: finish()
}

View File

@@ -200,7 +200,7 @@ class ImportBookActivity : VMBaseActivity<ActivityImportBookBinding, ImportBookV
private fun upSort(sort: Int) {
viewModel.sort = sort
putPrefInt(PreferKey.localBookImportSort, sort)
if (scanDocJob?.isCancelled == true || scanDocJob?.isCompleted == true) {
if (scanDocJob?.isActive != true) {
viewModel.dataCallback?.setItems(adapter.getItems())
}
}