diff --git a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt index 580434e..3e629e4 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt @@ -126,7 +126,14 @@ } }) uploadFileViewModel.loadState.observe(this, { - DialogHelper.dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中,请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) siteEditView.addTextChangedListener(object : TextWatcher { @@ -227,10 +234,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - DialogHelper.showLoadingDialog( - this@UploadEventActivity, - "图片上传中,请稍后..." - ) if (result == null) { "选择照片失败,请重试".show(context) return diff --git a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt index 580434e..3e629e4 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt @@ -126,7 +126,14 @@ } }) uploadFileViewModel.loadState.observe(this, { - DialogHelper.dismissLoadingDialog() + when (it) { + LoadState.Loading -> { + DialogHelper.showLoadingDialog(this, "图片上传中,请稍后...") + } + else -> { + DialogHelper.dismissLoadingDialog() + } + } }) siteEditView.addTextChangedListener(object : TextWatcher { @@ -227,10 +234,6 @@ .setImageEngine(GlideLoadEngine.instance) .forResult(object : OnResultCallbackListener { override fun onResult(result: ArrayList?) { - DialogHelper.showLoadingDialog( - this@UploadEventActivity, - "图片上传中,请稍后..." - ) if (result == null) { "选择照片失败,请重试".show(context) return diff --git a/app/src/main/java/com/casic/br/operationsite/vm/UploadFileViewModel.kt b/app/src/main/java/com/casic/br/operationsite/vm/UploadFileViewModel.kt index 6ef047c..180feb5 100644 --- a/app/src/main/java/com/casic/br/operationsite/vm/UploadFileViewModel.kt +++ b/app/src/main/java/com/casic/br/operationsite/vm/UploadFileViewModel.kt @@ -20,6 +20,7 @@ val resultModel = MutableLiveData() fun uploadImage(image: File) = launch({ + loadState.value = LoadState.Loading val response = RetrofitServiceManager.uploadImage(image) val responseCode = response.separateResponseCode() if (responseCode == 200) {