Revert "feat:压缩文件调用系统处理"

This reverts commit 5c2867963b.
pull/1882/head
Xwite 3 years ago
parent 5c2867963b
commit 9bb61f2883
  1. 6
      app/src/main/java/io/legado/app/ui/association/ImportOnLineBookFileDialog.kt
  2. 16
      app/src/main/java/io/legado/app/ui/association/ImportOnLineBookFileViewModel.kt

@ -139,7 +139,7 @@ class ImportOnLineBookFileDialog() : BaseDialogFragment(R.layout.dialog_recycler
if (selectFile.third) { if (selectFile.third) {
viewModel.selectStatus[holder.layoutPosition] = isChecked viewModel.selectStatus[holder.layoutPosition] = isChecked
} else { } else {
toastOnUi("不支持直接导入,点击打开后解压") toastOnUi("不支持直接导入")
} }
upSelectText() upSelectText()
} }
@ -152,8 +152,8 @@ class ImportOnLineBookFileDialog() : BaseDialogFragment(R.layout.dialog_recycler
tvOpen.setOnClickListener { tvOpen.setOnClickListener {
val bookFile = viewModel.allBookFiles[holder.layoutPosition] val bookFile = viewModel.allBookFiles[holder.layoutPosition]
//intent解压 //intent解压
viewModel.downloadUrl(bookFile.first, bookFile.second).let { viewModel.downloadUrl(bookFile.first, bookFile.second) {
openFileUri(it) //openFileUri(it)
} }
} }
} }

@ -84,7 +84,11 @@ class ImportOnLineBookFileViewModel(app: Application) : BaseViewModel(app) {
val fileName: String = selectedFile.second val fileName: String = selectedFile.second
when { when {
isSupportedFile -> importOnLineBookFile(fileUrl, fileName) isSupportedFile -> importOnLineBookFile(fileUrl, fileName)
else -> downloadUrl(fileUrl, fileName) else -> {
downloadUrl(fileUrl, fileName) {
// AppLog.putDebug("下载文件路径: ${it.toString()}")
}
}
} }
} }
} }
@ -96,8 +100,14 @@ class ImportOnLineBookFileViewModel(app: Application) : BaseViewModel(app) {
} }
fun downloadUrl(url: String, fileName: String): Uri { fun downloadUrl(url: String, fileName: String, success: () -> Unit) {
return LocalBook.saveBookFile(url, fileName) execute {
LocalBook.saveBookFile(url, fileName)
}.onSuccess {
success.invoke()
}.onError {
context.toastOnUi("下载书籍文件失败\n${it.localizedMessage}")
}
} }
fun importOnLineBookFile(url: String, fileName: String) { fun importOnLineBookFile(url: String, fileName: String) {

Loading…
Cancel
Save