diff --git a/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookActivity.kt index 2af3f3b4d..40c1d7b79 100644 --- a/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookActivity.kt @@ -44,8 +44,19 @@ class RemoteBookActivity : BaseImportBookActivity + binding.refreshProgressBar.isAutoLoading = false + binding.tvEmptyMsg.isGone = sortedRemoteBooks.isNotEmpty() + adapter.setItems(sortedRemoteBooks) + delay(500) + } + } + viewModel.initData { + binding.refreshProgressBar.isAutoLoading = true + upPath() + } } } @@ -69,19 +80,6 @@ class RemoteBookActivity : BaseImportBookActivity - binding.refreshProgressBar.isAutoLoading = false - binding.tvEmptyMsg.isGone = sortedRemoteBooks.isNotEmpty() - adapter.setItems(sortedRemoteBooks) - delay(500) - } - } - upPath() - } - private fun initEvent() { binding.tvGoBack.setOnClickListener { goBackDir() diff --git a/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookViewModel.kt index 1e85f8c79..c26c9030f 100644 --- a/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/import/remote/RemoteBookViewModel.kt @@ -74,7 +74,7 @@ class RemoteBookViewModel(application: Application) : BaseViewModel(application) private var remoteBookWebDav: RemoteBookWebDav? = null - init { + fun initData(onSuccess: () -> Unit) { execute { val rootUrl = "${AppWebDav.rootWebDavUrl}books" val authorization = AppWebDav.authorization @@ -82,6 +82,8 @@ class RemoteBookViewModel(application: Application) : BaseViewModel(application) remoteBookWebDav = RemoteBookWebDav(rootUrl, authorization) }.onError { context.toastOnUi("初始化webDav出错:${it.localizedMessage}") + }.onSuccess { + onSuccess.invoke() } }