diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt new file mode 100644 index 0000000..cd6eb4c --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt @@ -0,0 +1,11 @@ +package com.casic.xz.meterage.extensions + +import java.net.ConnectException + +fun Throwable.convertChinese(): String { + this.printStackTrace() + return when (this) { + is ConnectException -> "连接失败，请检查网络或者服务器" + else -> "未知异常" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt new file mode 100644 index 0000000..cd6eb4c --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt @@ -0,0 +1,11 @@ +package com.casic.xz.meterage.extensions + +import java.net.ConnectException + +fun Throwable.convertChinese(): String { + this.printStackTrace() + return when (this) { + is ConnectException -> "连接失败，请检查网络或者服务器" + else -> "未知异常" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 79f1ba6..6e23825 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.PublicKeyModel @@ -31,7 +32,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt new file mode 100644 index 0000000..cd6eb4c --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt @@ -0,0 +1,11 @@ +package com.casic.xz.meterage.extensions + +import java.net.ConnectException + +fun Throwable.convertChinese(): String { + this.printStackTrace() + return when (this) { + is ConnectException -> "连接失败，请检查网络或者服务器" + else -> "未知异常" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 79f1ba6..6e23825 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.PublicKeyModel @@ -31,7 +32,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index ea92a54..019c799 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.CapabilityDetailModel @@ -47,8 +48,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCapabilityDetail(id: String) = launch({ @@ -66,7 +66,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt new file mode 100644 index 0000000..cd6eb4c --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt @@ -0,0 +1,11 @@ +package com.casic.xz.meterage.extensions + +import java.net.ConnectException + +fun Throwable.convertChinese(): String { + this.printStackTrace() + return when (this) { + is ConnectException -> "连接失败，请检查网络或者服务器" + else -> "未知异常" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 79f1ba6..6e23825 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.PublicKeyModel @@ -31,7 +32,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index ea92a54..019c799 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.CapabilityDetailModel @@ -47,8 +48,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCapabilityDetail(id: String) = launch({ @@ -66,7 +66,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 438637c..260f242 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -65,8 +66,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateReportDetail(id: String) = launch({ @@ -84,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun submit(id: String) = launch({ @@ -103,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun agree(taskId: String, comments: String) = launch({ @@ -122,8 +120,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun reject(taskId: String, comments: String) = launch({ @@ -141,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun refuse(taskId: String, comments: String) = launch({ @@ -160,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApprovalProcess(processId: String) = launch({ @@ -179,7 +174,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt new file mode 100644 index 0000000..cd6eb4c --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt @@ -0,0 +1,11 @@ +package com.casic.xz.meterage.extensions + +import java.net.ConnectException + +fun Throwable.convertChinese(): String { + this.printStackTrace() + return when (this) { + is ConnectException -> "连接失败，请检查网络或者服务器" + else -> "未知异常" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 79f1ba6..6e23825 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.PublicKeyModel @@ -31,7 +32,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index ea92a54..019c799 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.CapabilityDetailModel @@ -47,8 +48,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCapabilityDetail(id: String) = launch({ @@ -66,7 +66,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 438637c..260f242 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -65,8 +66,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateReportDetail(id: String) = launch({ @@ -84,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun submit(id: String) = launch({ @@ -103,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun agree(taskId: String, comments: String) = launch({ @@ -122,8 +120,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun reject(taskId: String, comments: String) = launch({ @@ -141,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun refuse(taskId: String, comments: String) = launch({ @@ -160,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApprovalProcess(processId: String) = launch({ @@ -179,7 +174,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt index e2e3603..63de371 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.DictionaryModel @@ -30,8 +31,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getPrefixCode() = launch({ @@ -45,7 +45,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt new file mode 100644 index 0000000..cd6eb4c --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt @@ -0,0 +1,11 @@ +package com.casic.xz.meterage.extensions + +import java.net.ConnectException + +fun Throwable.convertChinese(): String { + this.printStackTrace() + return when (this) { + is ConnectException -> "连接失败，请检查网络或者服务器" + else -> "未知异常" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 79f1ba6..6e23825 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.PublicKeyModel @@ -31,7 +32,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index ea92a54..019c799 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.CapabilityDetailModel @@ -47,8 +48,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCapabilityDetail(id: String) = launch({ @@ -66,7 +66,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 438637c..260f242 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -65,8 +66,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateReportDetail(id: String) = launch({ @@ -84,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun submit(id: String) = launch({ @@ -103,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun agree(taskId: String, comments: String) = launch({ @@ -122,8 +120,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun reject(taskId: String, comments: String) = launch({ @@ -141,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun refuse(taskId: String, comments: String) = launch({ @@ -160,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApprovalProcess(processId: String) = launch({ @@ -179,7 +174,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt index e2e3603..63de371 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.DictionaryModel @@ -30,8 +31,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getPrefixCode() = launch({ @@ -45,7 +45,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt index 6281e2b..bebb78b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ContractDetailModel @@ -62,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractDetail(id: String) = launch({ @@ -81,7 +81,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt new file mode 100644 index 0000000..cd6eb4c --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt @@ -0,0 +1,11 @@ +package com.casic.xz.meterage.extensions + +import java.net.ConnectException + +fun Throwable.convertChinese(): String { + this.printStackTrace() + return when (this) { + is ConnectException -> "连接失败，请检查网络或者服务器" + else -> "未知异常" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 79f1ba6..6e23825 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.PublicKeyModel @@ -31,7 +32,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index ea92a54..019c799 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.CapabilityDetailModel @@ -47,8 +48,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCapabilityDetail(id: String) = launch({ @@ -66,7 +66,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 438637c..260f242 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -65,8 +66,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateReportDetail(id: String) = launch({ @@ -84,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun submit(id: String) = launch({ @@ -103,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun agree(taskId: String, comments: String) = launch({ @@ -122,8 +120,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun reject(taskId: String, comments: String) = launch({ @@ -141,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun refuse(taskId: String, comments: String) = launch({ @@ -160,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApprovalProcess(processId: String) = launch({ @@ -179,7 +174,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt index e2e3603..63de371 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.DictionaryModel @@ -30,8 +31,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getPrefixCode() = launch({ @@ -45,7 +45,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt index 6281e2b..bebb78b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ContractDetailModel @@ -62,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractDetail(id: String) = launch({ @@ -81,7 +81,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index 2516507..ee01db4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -44,8 +45,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCustomerDetail(id: String) = launch({ @@ -63,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSampleRecordById(id: String, offset: Int) = launch({ @@ -82,8 +81,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractRecordById( @@ -125,8 +123,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateRecordListPageById( @@ -148,7 +145,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt new file mode 100644 index 0000000..cd6eb4c --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt @@ -0,0 +1,11 @@ +package com.casic.xz.meterage.extensions + +import java.net.ConnectException + +fun Throwable.convertChinese(): String { + this.printStackTrace() + return when (this) { + is ConnectException -> "连接失败，请检查网络或者服务器" + else -> "未知异常" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 79f1ba6..6e23825 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.PublicKeyModel @@ -31,7 +32,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index ea92a54..019c799 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.CapabilityDetailModel @@ -47,8 +48,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCapabilityDetail(id: String) = launch({ @@ -66,7 +66,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 438637c..260f242 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -65,8 +66,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateReportDetail(id: String) = launch({ @@ -84,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun submit(id: String) = launch({ @@ -103,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun agree(taskId: String, comments: String) = launch({ @@ -122,8 +120,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun reject(taskId: String, comments: String) = launch({ @@ -141,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun refuse(taskId: String, comments: String) = launch({ @@ -160,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApprovalProcess(processId: String) = launch({ @@ -179,7 +174,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt index e2e3603..63de371 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.DictionaryModel @@ -30,8 +31,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getPrefixCode() = launch({ @@ -45,7 +45,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt index 6281e2b..bebb78b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ContractDetailModel @@ -62,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractDetail(id: String) = launch({ @@ -81,7 +81,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index 2516507..ee01db4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -44,8 +45,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCustomerDetail(id: String) = launch({ @@ -63,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSampleRecordById(id: String, offset: Int) = launch({ @@ -82,8 +81,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractRecordById( @@ -125,8 +123,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateRecordListPageById( @@ -148,7 +145,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt index 40126d0..8ceb88b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -49,8 +50,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getOutfieldDetectionDetail(id: String) = launch({ @@ -68,8 +68,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionListByState( @@ -111,8 +110,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionDetail(orderId: String, sampleId: String) = launch({ @@ -130,8 +128,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun receiveDetection(orderId: String, sampleId: String) = launch({ @@ -149,8 +146,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun completeDetection(orderId: String, sampleId: String) = launch({ @@ -168,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionCount() = launch({ @@ -183,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt new file mode 100644 index 0000000..cd6eb4c --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt @@ -0,0 +1,11 @@ +package com.casic.xz.meterage.extensions + +import java.net.ConnectException + +fun Throwable.convertChinese(): String { + this.printStackTrace() + return when (this) { + is ConnectException -> "连接失败，请检查网络或者服务器" + else -> "未知异常" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 79f1ba6..6e23825 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.PublicKeyModel @@ -31,7 +32,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index ea92a54..019c799 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.CapabilityDetailModel @@ -47,8 +48,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCapabilityDetail(id: String) = launch({ @@ -66,7 +66,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 438637c..260f242 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -65,8 +66,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateReportDetail(id: String) = launch({ @@ -84,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun submit(id: String) = launch({ @@ -103,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun agree(taskId: String, comments: String) = launch({ @@ -122,8 +120,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun reject(taskId: String, comments: String) = launch({ @@ -141,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun refuse(taskId: String, comments: String) = launch({ @@ -160,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApprovalProcess(processId: String) = launch({ @@ -179,7 +174,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt index e2e3603..63de371 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.DictionaryModel @@ -30,8 +31,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getPrefixCode() = launch({ @@ -45,7 +45,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt index 6281e2b..bebb78b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ContractDetailModel @@ -62,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractDetail(id: String) = launch({ @@ -81,7 +81,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index 2516507..ee01db4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -44,8 +45,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCustomerDetail(id: String) = launch({ @@ -63,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSampleRecordById(id: String, offset: Int) = launch({ @@ -82,8 +81,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractRecordById( @@ -125,8 +123,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateRecordListPageById( @@ -148,7 +145,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt index 40126d0..8ceb88b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -49,8 +50,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getOutfieldDetectionDetail(id: String) = launch({ @@ -68,8 +68,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionListByState( @@ -111,8 +110,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionDetail(orderId: String, sampleId: String) = launch({ @@ -130,8 +128,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun receiveDetection(orderId: String, sampleId: String) = launch({ @@ -149,8 +146,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun completeDetection(orderId: String, sampleId: String) = launch({ @@ -168,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionCount() = launch({ @@ -183,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt index 5ccba03..6dd5f77 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -63,8 +64,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEntrustDetail(id: String) = launch({ @@ -82,8 +82,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun acceptEntrust(id: String) = launch({ @@ -101,8 +100,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun returnEntrust(id: String, selected: ArrayList) = launch({ @@ -120,8 +118,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun addEntrust( @@ -167,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEntrustLog(id: String) = launch({ @@ -182,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt new file mode 100644 index 0000000..cd6eb4c --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt @@ -0,0 +1,11 @@ +package com.casic.xz.meterage.extensions + +import java.net.ConnectException + +fun Throwable.convertChinese(): String { + this.printStackTrace() + return when (this) { + is ConnectException -> "连接失败，请检查网络或者服务器" + else -> "未知异常" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 79f1ba6..6e23825 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.PublicKeyModel @@ -31,7 +32,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index ea92a54..019c799 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.CapabilityDetailModel @@ -47,8 +48,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCapabilityDetail(id: String) = launch({ @@ -66,7 +66,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 438637c..260f242 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -65,8 +66,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateReportDetail(id: String) = launch({ @@ -84,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun submit(id: String) = launch({ @@ -103,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun agree(taskId: String, comments: String) = launch({ @@ -122,8 +120,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun reject(taskId: String, comments: String) = launch({ @@ -141,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun refuse(taskId: String, comments: String) = launch({ @@ -160,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApprovalProcess(processId: String) = launch({ @@ -179,7 +174,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt index e2e3603..63de371 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.DictionaryModel @@ -30,8 +31,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getPrefixCode() = launch({ @@ -45,7 +45,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt index 6281e2b..bebb78b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ContractDetailModel @@ -62,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractDetail(id: String) = launch({ @@ -81,7 +81,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index 2516507..ee01db4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -44,8 +45,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCustomerDetail(id: String) = launch({ @@ -63,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSampleRecordById(id: String, offset: Int) = launch({ @@ -82,8 +81,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractRecordById( @@ -125,8 +123,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateRecordListPageById( @@ -148,7 +145,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt index 40126d0..8ceb88b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -49,8 +50,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getOutfieldDetectionDetail(id: String) = launch({ @@ -68,8 +68,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionListByState( @@ -111,8 +110,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionDetail(orderId: String, sampleId: String) = launch({ @@ -130,8 +128,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun receiveDetection(orderId: String, sampleId: String) = launch({ @@ -149,8 +146,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun completeDetection(orderId: String, sampleId: String) = launch({ @@ -168,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionCount() = launch({ @@ -183,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt index 5ccba03..6dd5f77 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -63,8 +64,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEntrustDetail(id: String) = launch({ @@ -82,8 +82,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun acceptEntrust(id: String) = launch({ @@ -101,8 +100,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun returnEntrust(id: String, selected: ArrayList) = launch({ @@ -120,8 +118,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun addEntrust( @@ -167,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEntrustLog(id: String) = launch({ @@ -182,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6291b19..7359ff3 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -83,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentDetail(id: String) = launch({ @@ -102,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStandardDeviceList( @@ -139,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStandardDeviceDetail(id: String) = launch({ @@ -158,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSupportEquipmentList(id: String) = launch({ @@ -177,8 +174,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentStateChangeLog(id: String) = launch({ @@ -196,8 +192,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentUsageRecord(id: String) = launch({ @@ -215,8 +210,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindEquipmentCount() = launch({ @@ -230,8 +224,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindEquipmentList( @@ -297,8 +290,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun remindEquipment(id: String) = launch({ @@ -312,8 +304,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindDeviceCount() = launch({ @@ -327,8 +318,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindDeviceList( @@ -372,8 +362,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun remindDevice(id: String) = launch({ @@ -387,7 +376,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt new file mode 100644 index 0000000..cd6eb4c --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt @@ -0,0 +1,11 @@ +package com.casic.xz.meterage.extensions + +import java.net.ConnectException + +fun Throwable.convertChinese(): String { + this.printStackTrace() + return when (this) { + is ConnectException -> "连接失败，请检查网络或者服务器" + else -> "未知异常" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 79f1ba6..6e23825 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.PublicKeyModel @@ -31,7 +32,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index ea92a54..019c799 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.CapabilityDetailModel @@ -47,8 +48,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCapabilityDetail(id: String) = launch({ @@ -66,7 +66,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 438637c..260f242 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -65,8 +66,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateReportDetail(id: String) = launch({ @@ -84,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun submit(id: String) = launch({ @@ -103,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun agree(taskId: String, comments: String) = launch({ @@ -122,8 +120,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun reject(taskId: String, comments: String) = launch({ @@ -141,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun refuse(taskId: String, comments: String) = launch({ @@ -160,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApprovalProcess(processId: String) = launch({ @@ -179,7 +174,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt index e2e3603..63de371 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.DictionaryModel @@ -30,8 +31,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getPrefixCode() = launch({ @@ -45,7 +45,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt index 6281e2b..bebb78b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ContractDetailModel @@ -62,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractDetail(id: String) = launch({ @@ -81,7 +81,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index 2516507..ee01db4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -44,8 +45,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCustomerDetail(id: String) = launch({ @@ -63,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSampleRecordById(id: String, offset: Int) = launch({ @@ -82,8 +81,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractRecordById( @@ -125,8 +123,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateRecordListPageById( @@ -148,7 +145,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt index 40126d0..8ceb88b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -49,8 +50,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getOutfieldDetectionDetail(id: String) = launch({ @@ -68,8 +68,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionListByState( @@ -111,8 +110,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionDetail(orderId: String, sampleId: String) = launch({ @@ -130,8 +128,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun receiveDetection(orderId: String, sampleId: String) = launch({ @@ -149,8 +146,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun completeDetection(orderId: String, sampleId: String) = launch({ @@ -168,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionCount() = launch({ @@ -183,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt index 5ccba03..6dd5f77 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -63,8 +64,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEntrustDetail(id: String) = launch({ @@ -82,8 +82,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun acceptEntrust(id: String) = launch({ @@ -101,8 +100,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun returnEntrust(id: String, selected: ArrayList) = launch({ @@ -120,8 +118,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun addEntrust( @@ -167,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEntrustLog(id: String) = launch({ @@ -182,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6291b19..7359ff3 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -83,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentDetail(id: String) = launch({ @@ -102,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStandardDeviceList( @@ -139,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStandardDeviceDetail(id: String) = launch({ @@ -158,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSupportEquipmentList(id: String) = launch({ @@ -177,8 +174,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentStateChangeLog(id: String) = launch({ @@ -196,8 +192,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentUsageRecord(id: String) = launch({ @@ -215,8 +210,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindEquipmentCount() = launch({ @@ -230,8 +224,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindEquipmentList( @@ -297,8 +290,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun remindEquipment(id: String) = launch({ @@ -312,8 +304,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindDeviceCount() = launch({ @@ -327,8 +318,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindDeviceList( @@ -372,8 +362,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun remindDevice(id: String) = launch({ @@ -387,7 +376,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt index 348183f..eb09ca6 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.UploadResultModel @@ -37,8 +38,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApkVersionList( @@ -60,7 +60,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt new file mode 100644 index 0000000..cd6eb4c --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt @@ -0,0 +1,11 @@ +package com.casic.xz.meterage.extensions + +import java.net.ConnectException + +fun Throwable.convertChinese(): String { + this.printStackTrace() + return when (this) { + is ConnectException -> "连接失败，请检查网络或者服务器" + else -> "未知异常" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 79f1ba6..6e23825 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.PublicKeyModel @@ -31,7 +32,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index ea92a54..019c799 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.CapabilityDetailModel @@ -47,8 +48,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCapabilityDetail(id: String) = launch({ @@ -66,7 +66,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 438637c..260f242 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -65,8 +66,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateReportDetail(id: String) = launch({ @@ -84,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun submit(id: String) = launch({ @@ -103,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun agree(taskId: String, comments: String) = launch({ @@ -122,8 +120,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun reject(taskId: String, comments: String) = launch({ @@ -141,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun refuse(taskId: String, comments: String) = launch({ @@ -160,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApprovalProcess(processId: String) = launch({ @@ -179,7 +174,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt index e2e3603..63de371 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.DictionaryModel @@ -30,8 +31,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getPrefixCode() = launch({ @@ -45,7 +45,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt index 6281e2b..bebb78b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ContractDetailModel @@ -62,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractDetail(id: String) = launch({ @@ -81,7 +81,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index 2516507..ee01db4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -44,8 +45,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCustomerDetail(id: String) = launch({ @@ -63,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSampleRecordById(id: String, offset: Int) = launch({ @@ -82,8 +81,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractRecordById( @@ -125,8 +123,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateRecordListPageById( @@ -148,7 +145,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt index 40126d0..8ceb88b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -49,8 +50,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getOutfieldDetectionDetail(id: String) = launch({ @@ -68,8 +68,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionListByState( @@ -111,8 +110,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionDetail(orderId: String, sampleId: String) = launch({ @@ -130,8 +128,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun receiveDetection(orderId: String, sampleId: String) = launch({ @@ -149,8 +146,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun completeDetection(orderId: String, sampleId: String) = launch({ @@ -168,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionCount() = launch({ @@ -183,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt index 5ccba03..6dd5f77 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -63,8 +64,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEntrustDetail(id: String) = launch({ @@ -82,8 +82,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun acceptEntrust(id: String) = launch({ @@ -101,8 +100,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun returnEntrust(id: String, selected: ArrayList) = launch({ @@ -120,8 +118,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun addEntrust( @@ -167,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEntrustLog(id: String) = launch({ @@ -182,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6291b19..7359ff3 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -83,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentDetail(id: String) = launch({ @@ -102,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStandardDeviceList( @@ -139,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStandardDeviceDetail(id: String) = launch({ @@ -158,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSupportEquipmentList(id: String) = launch({ @@ -177,8 +174,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentStateChangeLog(id: String) = launch({ @@ -196,8 +192,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentUsageRecord(id: String) = launch({ @@ -215,8 +210,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindEquipmentCount() = launch({ @@ -230,8 +224,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindEquipmentList( @@ -297,8 +290,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun remindEquipment(id: String) = launch({ @@ -312,8 +304,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindDeviceCount() = launch({ @@ -327,8 +318,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindDeviceList( @@ -372,8 +362,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun remindDevice(id: String) = launch({ @@ -387,7 +376,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt index 348183f..eb09ca6 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.UploadResultModel @@ -37,8 +38,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApkVersionList( @@ -60,7 +60,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt index f9a4f4b..29150f2 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.GlobalResultModel @@ -46,7 +47,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt new file mode 100644 index 0000000..cd6eb4c --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt @@ -0,0 +1,11 @@ +package com.casic.xz.meterage.extensions + +import java.net.ConnectException + +fun Throwable.convertChinese(): String { + this.printStackTrace() + return when (this) { + is ConnectException -> "连接失败，请检查网络或者服务器" + else -> "未知异常" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 79f1ba6..6e23825 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.PublicKeyModel @@ -31,7 +32,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index ea92a54..019c799 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.CapabilityDetailModel @@ -47,8 +48,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCapabilityDetail(id: String) = launch({ @@ -66,7 +66,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 438637c..260f242 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -65,8 +66,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateReportDetail(id: String) = launch({ @@ -84,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun submit(id: String) = launch({ @@ -103,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun agree(taskId: String, comments: String) = launch({ @@ -122,8 +120,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun reject(taskId: String, comments: String) = launch({ @@ -141,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun refuse(taskId: String, comments: String) = launch({ @@ -160,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApprovalProcess(processId: String) = launch({ @@ -179,7 +174,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt index e2e3603..63de371 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.DictionaryModel @@ -30,8 +31,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getPrefixCode() = launch({ @@ -45,7 +45,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt index 6281e2b..bebb78b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ContractDetailModel @@ -62,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractDetail(id: String) = launch({ @@ -81,7 +81,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index 2516507..ee01db4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -44,8 +45,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCustomerDetail(id: String) = launch({ @@ -63,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSampleRecordById(id: String, offset: Int) = launch({ @@ -82,8 +81,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractRecordById( @@ -125,8 +123,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateRecordListPageById( @@ -148,7 +145,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt index 40126d0..8ceb88b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -49,8 +50,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getOutfieldDetectionDetail(id: String) = launch({ @@ -68,8 +68,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionListByState( @@ -111,8 +110,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionDetail(orderId: String, sampleId: String) = launch({ @@ -130,8 +128,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun receiveDetection(orderId: String, sampleId: String) = launch({ @@ -149,8 +146,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun completeDetection(orderId: String, sampleId: String) = launch({ @@ -168,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionCount() = launch({ @@ -183,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt index 5ccba03..6dd5f77 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -63,8 +64,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEntrustDetail(id: String) = launch({ @@ -82,8 +82,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun acceptEntrust(id: String) = launch({ @@ -101,8 +100,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun returnEntrust(id: String, selected: ArrayList) = launch({ @@ -120,8 +118,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun addEntrust( @@ -167,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEntrustLog(id: String) = launch({ @@ -182,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6291b19..7359ff3 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -83,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentDetail(id: String) = launch({ @@ -102,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStandardDeviceList( @@ -139,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStandardDeviceDetail(id: String) = launch({ @@ -158,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSupportEquipmentList(id: String) = launch({ @@ -177,8 +174,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentStateChangeLog(id: String) = launch({ @@ -196,8 +192,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentUsageRecord(id: String) = launch({ @@ -215,8 +210,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindEquipmentCount() = launch({ @@ -230,8 +224,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindEquipmentList( @@ -297,8 +290,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun remindEquipment(id: String) = launch({ @@ -312,8 +304,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindDeviceCount() = launch({ @@ -327,8 +318,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindDeviceList( @@ -372,8 +362,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun remindDevice(id: String) = launch({ @@ -387,7 +376,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt index 348183f..eb09ca6 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.UploadResultModel @@ -37,8 +38,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApkVersionList( @@ -60,7 +60,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt index f9a4f4b..29150f2 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.GlobalResultModel @@ -46,7 +47,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 43e4632..ce13a4a 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -66,8 +67,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getMeterageTrainDetail(id: String) = launch({ @@ -85,8 +85,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStaffList(id: String) = launch({ @@ -104,8 +103,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun signIn(staffId: String, planId: String) = launch({ @@ -123,7 +121,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt new file mode 100644 index 0000000..cd6eb4c --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt @@ -0,0 +1,11 @@ +package com.casic.xz.meterage.extensions + +import java.net.ConnectException + +fun Throwable.convertChinese(): String { + this.printStackTrace() + return when (this) { + is ConnectException -> "连接失败，请检查网络或者服务器" + else -> "未知异常" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 79f1ba6..6e23825 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.PublicKeyModel @@ -31,7 +32,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index ea92a54..019c799 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.CapabilityDetailModel @@ -47,8 +48,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCapabilityDetail(id: String) = launch({ @@ -66,7 +66,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 438637c..260f242 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -65,8 +66,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateReportDetail(id: String) = launch({ @@ -84,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun submit(id: String) = launch({ @@ -103,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun agree(taskId: String, comments: String) = launch({ @@ -122,8 +120,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun reject(taskId: String, comments: String) = launch({ @@ -141,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun refuse(taskId: String, comments: String) = launch({ @@ -160,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApprovalProcess(processId: String) = launch({ @@ -179,7 +174,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt index e2e3603..63de371 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.DictionaryModel @@ -30,8 +31,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getPrefixCode() = launch({ @@ -45,7 +45,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt index 6281e2b..bebb78b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ContractDetailModel @@ -62,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractDetail(id: String) = launch({ @@ -81,7 +81,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index 2516507..ee01db4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -44,8 +45,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCustomerDetail(id: String) = launch({ @@ -63,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSampleRecordById(id: String, offset: Int) = launch({ @@ -82,8 +81,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractRecordById( @@ -125,8 +123,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateRecordListPageById( @@ -148,7 +145,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt index 40126d0..8ceb88b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -49,8 +50,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getOutfieldDetectionDetail(id: String) = launch({ @@ -68,8 +68,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionListByState( @@ -111,8 +110,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionDetail(orderId: String, sampleId: String) = launch({ @@ -130,8 +128,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun receiveDetection(orderId: String, sampleId: String) = launch({ @@ -149,8 +146,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun completeDetection(orderId: String, sampleId: String) = launch({ @@ -168,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionCount() = launch({ @@ -183,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt index 5ccba03..6dd5f77 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -63,8 +64,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEntrustDetail(id: String) = launch({ @@ -82,8 +82,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun acceptEntrust(id: String) = launch({ @@ -101,8 +100,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun returnEntrust(id: String, selected: ArrayList) = launch({ @@ -120,8 +118,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun addEntrust( @@ -167,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEntrustLog(id: String) = launch({ @@ -182,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6291b19..7359ff3 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -83,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentDetail(id: String) = launch({ @@ -102,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStandardDeviceList( @@ -139,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStandardDeviceDetail(id: String) = launch({ @@ -158,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSupportEquipmentList(id: String) = launch({ @@ -177,8 +174,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentStateChangeLog(id: String) = launch({ @@ -196,8 +192,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentUsageRecord(id: String) = launch({ @@ -215,8 +210,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindEquipmentCount() = launch({ @@ -230,8 +224,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindEquipmentList( @@ -297,8 +290,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun remindEquipment(id: String) = launch({ @@ -312,8 +304,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindDeviceCount() = launch({ @@ -327,8 +318,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindDeviceList( @@ -372,8 +362,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun remindDevice(id: String) = launch({ @@ -387,7 +376,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt index 348183f..eb09ca6 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.UploadResultModel @@ -37,8 +38,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApkVersionList( @@ -60,7 +60,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt index f9a4f4b..29150f2 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.GlobalResultModel @@ -46,7 +47,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 43e4632..ce13a4a 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -66,8 +67,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getMeterageTrainDetail(id: String) = launch({ @@ -85,8 +85,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStaffList(id: String) = launch({ @@ -104,8 +103,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun signIn(staffId: String, planId: String) = launch({ @@ -123,7 +121,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index dd7943a..f6a93cf 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.model.ActionResultModel import com.casic.xz.meterage.model.NoticeListModel @@ -47,8 +48,7 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun readNotice(userId: String, ids: Array) = launch({ @@ -60,8 +60,7 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindList( @@ -82,8 +81,7 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun updateRemindStatus(id: String) = launch({ @@ -95,7 +93,6 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt new file mode 100644 index 0000000..cd6eb4c --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt @@ -0,0 +1,11 @@ +package com.casic.xz.meterage.extensions + +import java.net.ConnectException + +fun Throwable.convertChinese(): String { + this.printStackTrace() + return when (this) { + is ConnectException -> "连接失败，请检查网络或者服务器" + else -> "未知异常" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 79f1ba6..6e23825 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.PublicKeyModel @@ -31,7 +32,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index ea92a54..019c799 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.CapabilityDetailModel @@ -47,8 +48,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCapabilityDetail(id: String) = launch({ @@ -66,7 +66,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 438637c..260f242 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -65,8 +66,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateReportDetail(id: String) = launch({ @@ -84,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun submit(id: String) = launch({ @@ -103,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun agree(taskId: String, comments: String) = launch({ @@ -122,8 +120,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun reject(taskId: String, comments: String) = launch({ @@ -141,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun refuse(taskId: String, comments: String) = launch({ @@ -160,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApprovalProcess(processId: String) = launch({ @@ -179,7 +174,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt index e2e3603..63de371 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.DictionaryModel @@ -30,8 +31,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getPrefixCode() = launch({ @@ -45,7 +45,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt index 6281e2b..bebb78b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ContractDetailModel @@ -62,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractDetail(id: String) = launch({ @@ -81,7 +81,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index 2516507..ee01db4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -44,8 +45,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCustomerDetail(id: String) = launch({ @@ -63,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSampleRecordById(id: String, offset: Int) = launch({ @@ -82,8 +81,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractRecordById( @@ -125,8 +123,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateRecordListPageById( @@ -148,7 +145,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt index 40126d0..8ceb88b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -49,8 +50,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getOutfieldDetectionDetail(id: String) = launch({ @@ -68,8 +68,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionListByState( @@ -111,8 +110,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionDetail(orderId: String, sampleId: String) = launch({ @@ -130,8 +128,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun receiveDetection(orderId: String, sampleId: String) = launch({ @@ -149,8 +146,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun completeDetection(orderId: String, sampleId: String) = launch({ @@ -168,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionCount() = launch({ @@ -183,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt index 5ccba03..6dd5f77 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -63,8 +64,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEntrustDetail(id: String) = launch({ @@ -82,8 +82,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun acceptEntrust(id: String) = launch({ @@ -101,8 +100,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun returnEntrust(id: String, selected: ArrayList) = launch({ @@ -120,8 +118,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun addEntrust( @@ -167,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEntrustLog(id: String) = launch({ @@ -182,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6291b19..7359ff3 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -83,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentDetail(id: String) = launch({ @@ -102,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStandardDeviceList( @@ -139,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStandardDeviceDetail(id: String) = launch({ @@ -158,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSupportEquipmentList(id: String) = launch({ @@ -177,8 +174,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentStateChangeLog(id: String) = launch({ @@ -196,8 +192,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentUsageRecord(id: String) = launch({ @@ -215,8 +210,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindEquipmentCount() = launch({ @@ -230,8 +224,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindEquipmentList( @@ -297,8 +290,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun remindEquipment(id: String) = launch({ @@ -312,8 +304,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindDeviceCount() = launch({ @@ -327,8 +318,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindDeviceList( @@ -372,8 +362,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun remindDevice(id: String) = launch({ @@ -387,7 +376,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt index 348183f..eb09ca6 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.UploadResultModel @@ -37,8 +38,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApkVersionList( @@ -60,7 +60,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt index f9a4f4b..29150f2 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.GlobalResultModel @@ -46,7 +47,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 43e4632..ce13a4a 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -66,8 +67,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getMeterageTrainDetail(id: String) = launch({ @@ -85,8 +85,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStaffList(id: String) = launch({ @@ -104,8 +103,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun signIn(staffId: String, planId: String) = launch({ @@ -123,7 +121,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index dd7943a..f6a93cf 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.model.ActionResultModel import com.casic.xz.meterage.model.NoticeListModel @@ -47,8 +48,7 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun readNotice(userId: String, ids: Array) = launch({ @@ -60,8 +60,7 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindList( @@ -82,8 +81,7 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun updateRemindStatus(id: String) = launch({ @@ -95,7 +93,6 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt index bc4a173..d402b6c 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -41,8 +42,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun changePushSwitchState(clientId: String, enable: String) = launch({ @@ -60,7 +60,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt new file mode 100644 index 0000000..cd6eb4c --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt @@ -0,0 +1,11 @@ +package com.casic.xz.meterage.extensions + +import java.net.ConnectException + +fun Throwable.convertChinese(): String { + this.printStackTrace() + return when (this) { + is ConnectException -> "连接失败，请检查网络或者服务器" + else -> "未知异常" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 79f1ba6..6e23825 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.PublicKeyModel @@ -31,7 +32,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index ea92a54..019c799 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.CapabilityDetailModel @@ -47,8 +48,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCapabilityDetail(id: String) = launch({ @@ -66,7 +66,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 438637c..260f242 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -65,8 +66,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateReportDetail(id: String) = launch({ @@ -84,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun submit(id: String) = launch({ @@ -103,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun agree(taskId: String, comments: String) = launch({ @@ -122,8 +120,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun reject(taskId: String, comments: String) = launch({ @@ -141,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun refuse(taskId: String, comments: String) = launch({ @@ -160,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApprovalProcess(processId: String) = launch({ @@ -179,7 +174,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt index e2e3603..63de371 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.DictionaryModel @@ -30,8 +31,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getPrefixCode() = launch({ @@ -45,7 +45,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt index 6281e2b..bebb78b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ContractDetailModel @@ -62,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractDetail(id: String) = launch({ @@ -81,7 +81,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index 2516507..ee01db4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -44,8 +45,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCustomerDetail(id: String) = launch({ @@ -63,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSampleRecordById(id: String, offset: Int) = launch({ @@ -82,8 +81,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractRecordById( @@ -125,8 +123,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateRecordListPageById( @@ -148,7 +145,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt index 40126d0..8ceb88b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -49,8 +50,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getOutfieldDetectionDetail(id: String) = launch({ @@ -68,8 +68,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionListByState( @@ -111,8 +110,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionDetail(orderId: String, sampleId: String) = launch({ @@ -130,8 +128,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun receiveDetection(orderId: String, sampleId: String) = launch({ @@ -149,8 +146,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun completeDetection(orderId: String, sampleId: String) = launch({ @@ -168,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionCount() = launch({ @@ -183,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt index 5ccba03..6dd5f77 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -63,8 +64,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEntrustDetail(id: String) = launch({ @@ -82,8 +82,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun acceptEntrust(id: String) = launch({ @@ -101,8 +100,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun returnEntrust(id: String, selected: ArrayList) = launch({ @@ -120,8 +118,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun addEntrust( @@ -167,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEntrustLog(id: String) = launch({ @@ -182,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6291b19..7359ff3 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -83,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentDetail(id: String) = launch({ @@ -102,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStandardDeviceList( @@ -139,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStandardDeviceDetail(id: String) = launch({ @@ -158,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSupportEquipmentList(id: String) = launch({ @@ -177,8 +174,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentStateChangeLog(id: String) = launch({ @@ -196,8 +192,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentUsageRecord(id: String) = launch({ @@ -215,8 +210,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindEquipmentCount() = launch({ @@ -230,8 +224,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindEquipmentList( @@ -297,8 +290,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun remindEquipment(id: String) = launch({ @@ -312,8 +304,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindDeviceCount() = launch({ @@ -327,8 +318,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindDeviceList( @@ -372,8 +362,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun remindDevice(id: String) = launch({ @@ -387,7 +376,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt index 348183f..eb09ca6 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.UploadResultModel @@ -37,8 +38,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApkVersionList( @@ -60,7 +60,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt index f9a4f4b..29150f2 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.GlobalResultModel @@ -46,7 +47,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 43e4632..ce13a4a 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -66,8 +67,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getMeterageTrainDetail(id: String) = launch({ @@ -85,8 +85,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStaffList(id: String) = launch({ @@ -104,8 +103,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun signIn(staffId: String, planId: String) = launch({ @@ -123,7 +121,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index dd7943a..f6a93cf 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.model.ActionResultModel import com.casic.xz.meterage.model.NoticeListModel @@ -47,8 +48,7 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun readNotice(userId: String, ids: Array) = launch({ @@ -60,8 +60,7 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindList( @@ -82,8 +81,7 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun updateRemindStatus(id: String) = launch({ @@ -95,7 +93,6 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt index bc4a173..d402b6c 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -41,8 +42,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun changePushSwitchState(clientId: String, enable: String) = launch({ @@ -60,7 +60,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt index 5b917dc..12f5f6a 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -62,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun writeSample( @@ -117,7 +117,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt new file mode 100644 index 0000000..cd6eb4c --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt @@ -0,0 +1,11 @@ +package com.casic.xz.meterage.extensions + +import java.net.ConnectException + +fun Throwable.convertChinese(): String { + this.printStackTrace() + return when (this) { + is ConnectException -> "连接失败，请检查网络或者服务器" + else -> "未知异常" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 79f1ba6..6e23825 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.PublicKeyModel @@ -31,7 +32,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index ea92a54..019c799 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.CapabilityDetailModel @@ -47,8 +48,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCapabilityDetail(id: String) = launch({ @@ -66,7 +66,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 438637c..260f242 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -65,8 +66,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateReportDetail(id: String) = launch({ @@ -84,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun submit(id: String) = launch({ @@ -103,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun agree(taskId: String, comments: String) = launch({ @@ -122,8 +120,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun reject(taskId: String, comments: String) = launch({ @@ -141,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun refuse(taskId: String, comments: String) = launch({ @@ -160,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApprovalProcess(processId: String) = launch({ @@ -179,7 +174,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt index e2e3603..63de371 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.DictionaryModel @@ -30,8 +31,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getPrefixCode() = launch({ @@ -45,7 +45,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt index 6281e2b..bebb78b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ContractDetailModel @@ -62,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractDetail(id: String) = launch({ @@ -81,7 +81,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index 2516507..ee01db4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -44,8 +45,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCustomerDetail(id: String) = launch({ @@ -63,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSampleRecordById(id: String, offset: Int) = launch({ @@ -82,8 +81,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractRecordById( @@ -125,8 +123,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateRecordListPageById( @@ -148,7 +145,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt index 40126d0..8ceb88b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -49,8 +50,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getOutfieldDetectionDetail(id: String) = launch({ @@ -68,8 +68,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionListByState( @@ -111,8 +110,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionDetail(orderId: String, sampleId: String) = launch({ @@ -130,8 +128,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun receiveDetection(orderId: String, sampleId: String) = launch({ @@ -149,8 +146,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun completeDetection(orderId: String, sampleId: String) = launch({ @@ -168,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionCount() = launch({ @@ -183,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt index 5ccba03..6dd5f77 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -63,8 +64,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEntrustDetail(id: String) = launch({ @@ -82,8 +82,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun acceptEntrust(id: String) = launch({ @@ -101,8 +100,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun returnEntrust(id: String, selected: ArrayList) = launch({ @@ -120,8 +118,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun addEntrust( @@ -167,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEntrustLog(id: String) = launch({ @@ -182,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6291b19..7359ff3 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -83,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentDetail(id: String) = launch({ @@ -102,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStandardDeviceList( @@ -139,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStandardDeviceDetail(id: String) = launch({ @@ -158,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSupportEquipmentList(id: String) = launch({ @@ -177,8 +174,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentStateChangeLog(id: String) = launch({ @@ -196,8 +192,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentUsageRecord(id: String) = launch({ @@ -215,8 +210,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindEquipmentCount() = launch({ @@ -230,8 +224,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindEquipmentList( @@ -297,8 +290,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun remindEquipment(id: String) = launch({ @@ -312,8 +304,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindDeviceCount() = launch({ @@ -327,8 +318,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindDeviceList( @@ -372,8 +362,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun remindDevice(id: String) = launch({ @@ -387,7 +376,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt index 348183f..eb09ca6 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.UploadResultModel @@ -37,8 +38,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApkVersionList( @@ -60,7 +60,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt index f9a4f4b..29150f2 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.GlobalResultModel @@ -46,7 +47,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 43e4632..ce13a4a 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -66,8 +67,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getMeterageTrainDetail(id: String) = launch({ @@ -85,8 +85,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStaffList(id: String) = launch({ @@ -104,8 +103,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun signIn(staffId: String, planId: String) = launch({ @@ -123,7 +121,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index dd7943a..f6a93cf 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.model.ActionResultModel import com.casic.xz.meterage.model.NoticeListModel @@ -47,8 +48,7 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun readNotice(userId: String, ids: Array) = launch({ @@ -60,8 +60,7 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindList( @@ -82,8 +81,7 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun updateRemindStatus(id: String) = launch({ @@ -95,7 +93,6 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt index bc4a173..d402b6c 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -41,8 +42,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun changePushSwitchState(clientId: String, enable: String) = launch({ @@ -60,7 +60,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt index 5b917dc..12f5f6a 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -62,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun writeSample( @@ -117,7 +117,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/StandardFileViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/StandardFileViewModel.kt index 0b8c74a..09c290c 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/StandardFileViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/StandardFileViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.StandardFileModel @@ -60,7 +61,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt new file mode 100644 index 0000000..cd6eb4c --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt @@ -0,0 +1,11 @@ +package com.casic.xz.meterage.extensions + +import java.net.ConnectException + +fun Throwable.convertChinese(): String { + this.printStackTrace() + return when (this) { + is ConnectException -> "连接失败，请检查网络或者服务器" + else -> "未知异常" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 79f1ba6..6e23825 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.PublicKeyModel @@ -31,7 +32,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index ea92a54..019c799 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.CapabilityDetailModel @@ -47,8 +48,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCapabilityDetail(id: String) = launch({ @@ -66,7 +66,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 438637c..260f242 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -65,8 +66,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateReportDetail(id: String) = launch({ @@ -84,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun submit(id: String) = launch({ @@ -103,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun agree(taskId: String, comments: String) = launch({ @@ -122,8 +120,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun reject(taskId: String, comments: String) = launch({ @@ -141,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun refuse(taskId: String, comments: String) = launch({ @@ -160,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApprovalProcess(processId: String) = launch({ @@ -179,7 +174,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt index e2e3603..63de371 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.DictionaryModel @@ -30,8 +31,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getPrefixCode() = launch({ @@ -45,7 +45,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt index 6281e2b..bebb78b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ContractDetailModel @@ -62,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractDetail(id: String) = launch({ @@ -81,7 +81,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index 2516507..ee01db4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -44,8 +45,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCustomerDetail(id: String) = launch({ @@ -63,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSampleRecordById(id: String, offset: Int) = launch({ @@ -82,8 +81,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractRecordById( @@ -125,8 +123,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateRecordListPageById( @@ -148,7 +145,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt index 40126d0..8ceb88b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -49,8 +50,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getOutfieldDetectionDetail(id: String) = launch({ @@ -68,8 +68,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionListByState( @@ -111,8 +110,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionDetail(orderId: String, sampleId: String) = launch({ @@ -130,8 +128,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun receiveDetection(orderId: String, sampleId: String) = launch({ @@ -149,8 +146,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun completeDetection(orderId: String, sampleId: String) = launch({ @@ -168,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionCount() = launch({ @@ -183,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt index 5ccba03..6dd5f77 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -63,8 +64,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEntrustDetail(id: String) = launch({ @@ -82,8 +82,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun acceptEntrust(id: String) = launch({ @@ -101,8 +100,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun returnEntrust(id: String, selected: ArrayList) = launch({ @@ -120,8 +118,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun addEntrust( @@ -167,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEntrustLog(id: String) = launch({ @@ -182,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6291b19..7359ff3 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -83,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentDetail(id: String) = launch({ @@ -102,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStandardDeviceList( @@ -139,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStandardDeviceDetail(id: String) = launch({ @@ -158,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSupportEquipmentList(id: String) = launch({ @@ -177,8 +174,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentStateChangeLog(id: String) = launch({ @@ -196,8 +192,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentUsageRecord(id: String) = launch({ @@ -215,8 +210,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindEquipmentCount() = launch({ @@ -230,8 +224,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindEquipmentList( @@ -297,8 +290,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun remindEquipment(id: String) = launch({ @@ -312,8 +304,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindDeviceCount() = launch({ @@ -327,8 +318,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindDeviceList( @@ -372,8 +362,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun remindDevice(id: String) = launch({ @@ -387,7 +376,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt index 348183f..eb09ca6 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.UploadResultModel @@ -37,8 +38,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApkVersionList( @@ -60,7 +60,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt index f9a4f4b..29150f2 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.GlobalResultModel @@ -46,7 +47,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 43e4632..ce13a4a 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -66,8 +67,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getMeterageTrainDetail(id: String) = launch({ @@ -85,8 +85,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStaffList(id: String) = launch({ @@ -104,8 +103,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun signIn(staffId: String, planId: String) = launch({ @@ -123,7 +121,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index dd7943a..f6a93cf 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.model.ActionResultModel import com.casic.xz.meterage.model.NoticeListModel @@ -47,8 +48,7 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun readNotice(userId: String, ids: Array) = launch({ @@ -60,8 +60,7 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindList( @@ -82,8 +81,7 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun updateRemindStatus(id: String) = launch({ @@ -95,7 +93,6 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt index bc4a173..d402b6c 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -41,8 +42,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun changePushSwitchState(clientId: String, enable: String) = launch({ @@ -60,7 +60,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt index 5b917dc..12f5f6a 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -62,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun writeSample( @@ -117,7 +117,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/StandardFileViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/StandardFileViewModel.kt index 0b8c74a..09c290c 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/StandardFileViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/StandardFileViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.StandardFileModel @@ -60,7 +61,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/StatisticsViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/StatisticsViewModel.kt index 36c9f2d..7a240aa 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/StatisticsViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/StatisticsViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.DeptComprehensiveModel @@ -38,8 +39,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDeptComprehensive(deptId: String, startTime: String, endTime: String) = launch({ @@ -57,7 +57,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt new file mode 100644 index 0000000..cd6eb4c --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt @@ -0,0 +1,11 @@ +package com.casic.xz.meterage.extensions + +import java.net.ConnectException + +fun Throwable.convertChinese(): String { + this.printStackTrace() + return when (this) { + is ConnectException -> "连接失败，请检查网络或者服务器" + else -> "未知异常" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 79f1ba6..6e23825 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.PublicKeyModel @@ -31,7 +32,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index ea92a54..019c799 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.CapabilityDetailModel @@ -47,8 +48,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCapabilityDetail(id: String) = launch({ @@ -66,7 +66,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 438637c..260f242 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -65,8 +66,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateReportDetail(id: String) = launch({ @@ -84,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun submit(id: String) = launch({ @@ -103,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun agree(taskId: String, comments: String) = launch({ @@ -122,8 +120,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun reject(taskId: String, comments: String) = launch({ @@ -141,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun refuse(taskId: String, comments: String) = launch({ @@ -160,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApprovalProcess(processId: String) = launch({ @@ -179,7 +174,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt index e2e3603..63de371 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.DictionaryModel @@ -30,8 +31,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getPrefixCode() = launch({ @@ -45,7 +45,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt index 6281e2b..bebb78b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ContractDetailModel @@ -62,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractDetail(id: String) = launch({ @@ -81,7 +81,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index 2516507..ee01db4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -44,8 +45,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCustomerDetail(id: String) = launch({ @@ -63,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSampleRecordById(id: String, offset: Int) = launch({ @@ -82,8 +81,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractRecordById( @@ -125,8 +123,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateRecordListPageById( @@ -148,7 +145,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt index 40126d0..8ceb88b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -49,8 +50,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getOutfieldDetectionDetail(id: String) = launch({ @@ -68,8 +68,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionListByState( @@ -111,8 +110,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionDetail(orderId: String, sampleId: String) = launch({ @@ -130,8 +128,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun receiveDetection(orderId: String, sampleId: String) = launch({ @@ -149,8 +146,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun completeDetection(orderId: String, sampleId: String) = launch({ @@ -168,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionCount() = launch({ @@ -183,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt index 5ccba03..6dd5f77 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -63,8 +64,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEntrustDetail(id: String) = launch({ @@ -82,8 +82,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun acceptEntrust(id: String) = launch({ @@ -101,8 +100,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun returnEntrust(id: String, selected: ArrayList) = launch({ @@ -120,8 +118,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun addEntrust( @@ -167,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEntrustLog(id: String) = launch({ @@ -182,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6291b19..7359ff3 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -83,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentDetail(id: String) = launch({ @@ -102,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStandardDeviceList( @@ -139,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStandardDeviceDetail(id: String) = launch({ @@ -158,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSupportEquipmentList(id: String) = launch({ @@ -177,8 +174,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentStateChangeLog(id: String) = launch({ @@ -196,8 +192,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentUsageRecord(id: String) = launch({ @@ -215,8 +210,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindEquipmentCount() = launch({ @@ -230,8 +224,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindEquipmentList( @@ -297,8 +290,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun remindEquipment(id: String) = launch({ @@ -312,8 +304,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindDeviceCount() = launch({ @@ -327,8 +318,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindDeviceList( @@ -372,8 +362,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun remindDevice(id: String) = launch({ @@ -387,7 +376,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt index 348183f..eb09ca6 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.UploadResultModel @@ -37,8 +38,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApkVersionList( @@ -60,7 +60,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt index f9a4f4b..29150f2 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.GlobalResultModel @@ -46,7 +47,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 43e4632..ce13a4a 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -66,8 +67,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getMeterageTrainDetail(id: String) = launch({ @@ -85,8 +85,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStaffList(id: String) = launch({ @@ -104,8 +103,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun signIn(staffId: String, planId: String) = launch({ @@ -123,7 +121,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index dd7943a..f6a93cf 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.model.ActionResultModel import com.casic.xz.meterage.model.NoticeListModel @@ -47,8 +48,7 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun readNotice(userId: String, ids: Array) = launch({ @@ -60,8 +60,7 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindList( @@ -82,8 +81,7 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun updateRemindStatus(id: String) = launch({ @@ -95,7 +93,6 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt index bc4a173..d402b6c 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -41,8 +42,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun changePushSwitchState(clientId: String, enable: String) = launch({ @@ -60,7 +60,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt index 5b917dc..12f5f6a 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -62,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun writeSample( @@ -117,7 +117,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/StandardFileViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/StandardFileViewModel.kt index 0b8c74a..09c290c 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/StandardFileViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/StandardFileViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.StandardFileModel @@ -60,7 +61,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/StatisticsViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/StatisticsViewModel.kt index 36c9f2d..7a240aa 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/StatisticsViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/StatisticsViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.DeptComprehensiveModel @@ -38,8 +39,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDeptComprehensive(deptId: String, startTime: String, endTime: String) = launch({ @@ -57,7 +57,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/TaskViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/TaskViewModel.kt index 54d6704..f6fe368 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/TaskViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/TaskViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.TaskCountModel @@ -67,8 +68,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getTaskDetail(orderId: String, sampleId: String) = launch({ @@ -86,8 +86,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getTaskCount() = launch({ @@ -101,7 +100,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt new file mode 100644 index 0000000..cd6eb4c --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt @@ -0,0 +1,11 @@ +package com.casic.xz.meterage.extensions + +import java.net.ConnectException + +fun Throwable.convertChinese(): String { + this.printStackTrace() + return when (this) { + is ConnectException -> "连接失败，请检查网络或者服务器" + else -> "未知异常" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 79f1ba6..6e23825 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.PublicKeyModel @@ -31,7 +32,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index ea92a54..019c799 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.CapabilityDetailModel @@ -47,8 +48,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCapabilityDetail(id: String) = launch({ @@ -66,7 +66,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 438637c..260f242 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -65,8 +66,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateReportDetail(id: String) = launch({ @@ -84,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun submit(id: String) = launch({ @@ -103,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun agree(taskId: String, comments: String) = launch({ @@ -122,8 +120,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun reject(taskId: String, comments: String) = launch({ @@ -141,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun refuse(taskId: String, comments: String) = launch({ @@ -160,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApprovalProcess(processId: String) = launch({ @@ -179,7 +174,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt index e2e3603..63de371 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.DictionaryModel @@ -30,8 +31,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getPrefixCode() = launch({ @@ -45,7 +45,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt index 6281e2b..bebb78b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ContractDetailModel @@ -62,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractDetail(id: String) = launch({ @@ -81,7 +81,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index 2516507..ee01db4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -44,8 +45,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCustomerDetail(id: String) = launch({ @@ -63,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSampleRecordById(id: String, offset: Int) = launch({ @@ -82,8 +81,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractRecordById( @@ -125,8 +123,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateRecordListPageById( @@ -148,7 +145,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt index 40126d0..8ceb88b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -49,8 +50,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getOutfieldDetectionDetail(id: String) = launch({ @@ -68,8 +68,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionListByState( @@ -111,8 +110,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionDetail(orderId: String, sampleId: String) = launch({ @@ -130,8 +128,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun receiveDetection(orderId: String, sampleId: String) = launch({ @@ -149,8 +146,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun completeDetection(orderId: String, sampleId: String) = launch({ @@ -168,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionCount() = launch({ @@ -183,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt index 5ccba03..6dd5f77 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -63,8 +64,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEntrustDetail(id: String) = launch({ @@ -82,8 +82,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun acceptEntrust(id: String) = launch({ @@ -101,8 +100,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun returnEntrust(id: String, selected: ArrayList) = launch({ @@ -120,8 +118,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun addEntrust( @@ -167,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEntrustLog(id: String) = launch({ @@ -182,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6291b19..7359ff3 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -83,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentDetail(id: String) = launch({ @@ -102,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStandardDeviceList( @@ -139,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStandardDeviceDetail(id: String) = launch({ @@ -158,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSupportEquipmentList(id: String) = launch({ @@ -177,8 +174,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentStateChangeLog(id: String) = launch({ @@ -196,8 +192,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentUsageRecord(id: String) = launch({ @@ -215,8 +210,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindEquipmentCount() = launch({ @@ -230,8 +224,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindEquipmentList( @@ -297,8 +290,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun remindEquipment(id: String) = launch({ @@ -312,8 +304,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindDeviceCount() = launch({ @@ -327,8 +318,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindDeviceList( @@ -372,8 +362,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun remindDevice(id: String) = launch({ @@ -387,7 +376,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt index 348183f..eb09ca6 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.UploadResultModel @@ -37,8 +38,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApkVersionList( @@ -60,7 +60,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt index f9a4f4b..29150f2 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.GlobalResultModel @@ -46,7 +47,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 43e4632..ce13a4a 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -66,8 +67,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getMeterageTrainDetail(id: String) = launch({ @@ -85,8 +85,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStaffList(id: String) = launch({ @@ -104,8 +103,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun signIn(staffId: String, planId: String) = launch({ @@ -123,7 +121,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index dd7943a..f6a93cf 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.model.ActionResultModel import com.casic.xz.meterage.model.NoticeListModel @@ -47,8 +48,7 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun readNotice(userId: String, ids: Array) = launch({ @@ -60,8 +60,7 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindList( @@ -82,8 +81,7 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun updateRemindStatus(id: String) = launch({ @@ -95,7 +93,6 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt index bc4a173..d402b6c 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -41,8 +42,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun changePushSwitchState(clientId: String, enable: String) = launch({ @@ -60,7 +60,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt index 5b917dc..12f5f6a 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -62,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun writeSample( @@ -117,7 +117,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/StandardFileViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/StandardFileViewModel.kt index 0b8c74a..09c290c 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/StandardFileViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/StandardFileViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.StandardFileModel @@ -60,7 +61,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/StatisticsViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/StatisticsViewModel.kt index 36c9f2d..7a240aa 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/StatisticsViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/StatisticsViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.DeptComprehensiveModel @@ -38,8 +39,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDeptComprehensive(deptId: String, startTime: String, endTime: String) = launch({ @@ -57,7 +57,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/TaskViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/TaskViewModel.kt index 54d6704..f6fe368 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/TaskViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/TaskViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.TaskCountModel @@ -67,8 +68,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getTaskDetail(orderId: String, sampleId: String) = launch({ @@ -86,8 +86,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getTaskCount() = launch({ @@ -101,7 +100,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f88e1d9..541d5a5 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -46,8 +47,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getUserInfo(account: String) = launch({ @@ -59,8 +59,7 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun isMeterStaff() = launch({ @@ -71,8 +70,7 @@ staffResult.value = isMeterStaff == 1 } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun updateUserInfo( @@ -102,8 +100,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun changePassword(oldPwd: String, newPwd: String) = launch({ @@ -121,8 +118,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun out() = launch({ @@ -136,8 +132,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun submitFeedback( @@ -213,7 +208,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt new file mode 100644 index 0000000..cd6eb4c --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/extensions/Throwable.kt @@ -0,0 +1,11 @@ +package com.casic.xz.meterage.extensions + +import java.net.ConnectException + +fun Throwable.convertChinese(): String { + this.printStackTrace() + return when (this) { + is ConnectException -> "连接失败，请检查网络或者服务器" + else -> "未知异常" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 79f1ba6..6e23825 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.PublicKeyModel @@ -31,7 +32,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index ea92a54..019c799 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.CapabilityDetailModel @@ -47,8 +48,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCapabilityDetail(id: String) = launch({ @@ -66,7 +66,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt index 438637c..260f242 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CertificateViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -65,8 +66,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateReportDetail(id: String) = launch({ @@ -84,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun submit(id: String) = launch({ @@ -103,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun agree(taskId: String, comments: String) = launch({ @@ -122,8 +120,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun reject(taskId: String, comments: String) = launch({ @@ -141,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun refuse(taskId: String, comments: String) = launch({ @@ -160,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApprovalProcess(processId: String) = launch({ @@ -179,7 +174,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt index e2e3603..63de371 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ConfigViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.DictionaryModel @@ -30,8 +31,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getPrefixCode() = launch({ @@ -45,7 +45,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt index 6281e2b..bebb78b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/ContractInvoiceViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ContractDetailModel @@ -62,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractDetail(id: String) = launch({ @@ -81,7 +81,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index 2516507..ee01db4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -44,8 +45,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCustomerDetail(id: String) = launch({ @@ -63,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSampleRecordById(id: String, offset: Int) = launch({ @@ -82,8 +81,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getContractRecordById( @@ -125,8 +123,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getCertificateRecordListPageById( @@ -148,7 +145,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt index 40126d0..8ceb88b 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/DetectionViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -49,8 +50,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getOutfieldDetectionDetail(id: String) = launch({ @@ -68,8 +68,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionListByState( @@ -111,8 +110,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionDetail(orderId: String, sampleId: String) = launch({ @@ -130,8 +128,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun receiveDetection(orderId: String, sampleId: String) = launch({ @@ -149,8 +146,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun completeDetection(orderId: String, sampleId: String) = launch({ @@ -168,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDetectionCount() = launch({ @@ -183,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt index 5ccba03..6dd5f77 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EntrustViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -63,8 +64,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEntrustDetail(id: String) = launch({ @@ -82,8 +82,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun acceptEntrust(id: String) = launch({ @@ -101,8 +100,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun returnEntrust(id: String, selected: ArrayList) = launch({ @@ -120,8 +118,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun addEntrust( @@ -167,8 +164,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEntrustLog(id: String) = launch({ @@ -182,7 +178,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6291b19..7359ff3 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.* @@ -83,8 +84,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentDetail(id: String) = launch({ @@ -102,8 +102,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStandardDeviceList( @@ -139,8 +138,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStandardDeviceDetail(id: String) = launch({ @@ -158,8 +156,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getSupportEquipmentList(id: String) = launch({ @@ -177,8 +174,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentStateChangeLog(id: String) = launch({ @@ -196,8 +192,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getEquipmentUsageRecord(id: String) = launch({ @@ -215,8 +210,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindEquipmentCount() = launch({ @@ -230,8 +224,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindEquipmentList( @@ -297,8 +290,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun remindEquipment(id: String) = launch({ @@ -312,8 +304,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindDeviceCount() = launch({ @@ -327,8 +318,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindDeviceList( @@ -372,8 +362,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun remindDevice(id: String) = launch({ @@ -387,7 +376,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt index 348183f..eb09ca6 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.UploadResultModel @@ -37,8 +38,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getApkVersionList( @@ -60,7 +60,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt index f9a4f4b..29150f2 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/GlobalSearchViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.GlobalResultModel @@ -46,7 +47,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 43e4632..ce13a4a 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -66,8 +67,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getMeterageTrainDetail(id: String) = launch({ @@ -85,8 +85,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getStaffList(id: String) = launch({ @@ -104,8 +103,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun signIn(staffId: String, planId: String) = launch({ @@ -123,7 +121,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index dd7943a..f6a93cf 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.model.ActionResultModel import com.casic.xz.meterage.model.NoticeListModel @@ -47,8 +48,7 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun readNotice(userId: String, ids: Array) = launch({ @@ -60,8 +60,7 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getRemindList( @@ -82,8 +81,7 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun updateRemindStatus(id: String) = launch({ @@ -95,7 +93,6 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt index bc4a173..d402b6c 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/PushConfigViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -41,8 +42,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun changePushSwitchState(clientId: String, enable: String) = launch({ @@ -60,7 +60,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt index 5b917dc..12f5f6a 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/SampleViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -62,8 +63,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun writeSample( @@ -117,7 +117,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/StandardFileViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/StandardFileViewModel.kt index 0b8c74a..09c290c 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/StandardFileViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/StandardFileViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.StandardFileModel @@ -60,7 +61,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/StatisticsViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/StatisticsViewModel.kt index 36c9f2d..7a240aa 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/StatisticsViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/StatisticsViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.DeptComprehensiveModel @@ -38,8 +39,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getDeptComprehensive(deptId: String, startTime: String, endTime: String) = launch({ @@ -57,7 +57,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/TaskViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/TaskViewModel.kt index 54d6704..f6fe368 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/TaskViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/TaskViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.TaskCountModel @@ -67,8 +68,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getTaskDetail(orderId: String, sampleId: String) = launch({ @@ -86,8 +86,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getTaskCount() = launch({ @@ -101,7 +100,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f88e1d9..541d5a5 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.ActionResultModel @@ -46,8 +47,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun getUserInfo(account: String) = launch({ @@ -59,8 +59,7 @@ ) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun isMeterStaff() = launch({ @@ -71,8 +70,7 @@ staffResult.value = isMeterStaff == 1 } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun updateUserInfo( @@ -102,8 +100,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun changePassword(oldPwd: String, newPwd: String) = launch({ @@ -121,8 +118,7 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun out() = launch({ @@ -136,8 +132,7 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) fun submitFeedback( @@ -213,7 +208,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt index a6119a7..bb18755 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -2,6 +2,7 @@ import androidx.lifecycle.MutableLiveData import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.convertChinese import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.extensions.toErrorMessage import com.casic.xz.meterage.model.VerifyRegulationListModel @@ -36,7 +37,6 @@ } }, { loadState.value = LoadState.Fail - it.cause.toString().show(BaseApplication.get()) - it.printStackTrace() + it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file