From 9bb61f28839eccbe1c601548c2b9ffd161fee910 Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Sat, 14 May 2022 17:15:02 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"feat:=E5=8E=8B=E7=BC=A9=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E8=B0=83=E7=94=A8=E7=B3=BB=E7=BB=9F=E5=A4=84=E7=90=86?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5c2867963baeff8075e33279f12b5cb7f3d822f6. --- .../ui/association/ImportOnLineBookFileDialog.kt | 6 +++--- .../association/ImportOnLineBookFileViewModel.kt | 16 +++++++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/association/ImportOnLineBookFileDialog.kt b/app/src/main/java/io/legado/app/ui/association/ImportOnLineBookFileDialog.kt index 522657b28..5414daf68 100644 --- a/app/src/main/java/io/legado/app/ui/association/ImportOnLineBookFileDialog.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportOnLineBookFileDialog.kt @@ -139,7 +139,7 @@ class ImportOnLineBookFileDialog() : BaseDialogFragment(R.layout.dialog_recycler if (selectFile.third) { viewModel.selectStatus[holder.layoutPosition] = isChecked } else { - toastOnUi("不支持直接导入,点击打开后解压") + toastOnUi("不支持直接导入") } upSelectText() } @@ -152,8 +152,8 @@ class ImportOnLineBookFileDialog() : BaseDialogFragment(R.layout.dialog_recycler tvOpen.setOnClickListener { val bookFile = viewModel.allBookFiles[holder.layoutPosition] //intent解压 - viewModel.downloadUrl(bookFile.first, bookFile.second).let { - openFileUri(it) + viewModel.downloadUrl(bookFile.first, bookFile.second) { + //openFileUri(it) } } } diff --git a/app/src/main/java/io/legado/app/ui/association/ImportOnLineBookFileViewModel.kt b/app/src/main/java/io/legado/app/ui/association/ImportOnLineBookFileViewModel.kt index 9b3812615..7422d8b47 100644 --- a/app/src/main/java/io/legado/app/ui/association/ImportOnLineBookFileViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportOnLineBookFileViewModel.kt @@ -84,7 +84,11 @@ class ImportOnLineBookFileViewModel(app: Application) : BaseViewModel(app) { val fileName: String = selectedFile.second when { 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 { - return LocalBook.saveBookFile(url, fileName) + fun downloadUrl(url: String, fileName: String, success: () -> Unit) { + execute { + LocalBook.saveBookFile(url, fileName) + }.onSuccess { + success.invoke() + }.onError { + context.toastOnUi("下载书籍文件失败\n${it.localizedMessage}") + } } fun importOnLineBookFile(url: String, fileName: String) {