diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt index fbf2588..05503e2 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt @@ -1,26 +1,29 @@ package com.casic.qd.smartwell.utils; -import android.content.Context +import android.app.Activity +import android.view.WindowManager import com.qmuiteam.qmui.widget.dialog.QMUITipDialog object DialogHelper { - private var loadingDialog: QMUITipDialog? = null + private lateinit var loadingDialog: QMUITipDialog - fun showLoadingDialog(context: Context?, message: String?) { - if (loadingDialog == null) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) + .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) + .setTipWord(message) + .create() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } } - loadingDialog!!.show() } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt index fbf2588..05503e2 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt @@ -1,26 +1,29 @@ package com.casic.qd.smartwell.utils; -import android.content.Context +import android.app.Activity +import android.view.WindowManager import com.qmuiteam.qmui.widget.dialog.QMUITipDialog object DialogHelper { - private var loadingDialog: QMUITipDialog? = null + private lateinit var loadingDialog: QMUITipDialog - fun showLoadingDialog(context: Context?, message: String?) { - if (loadingDialog == null) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) + .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) + .setTipWord(message) + .create() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } } - loadingDialog!!.show() } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt index f39c6ce..43dfa3a 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -18,7 +17,6 @@ class AlarmViewModel : BaseViewModel() { - private val kTag = "AlarmViewModel" private val gson = Gson() val typeModel = MutableLiveData() val contentModel = MutableLiveData() @@ -36,8 +34,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainAlarmContent(type: String) = launch({ @@ -51,8 +48,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainAlarmList( @@ -84,8 +80,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -102,8 +97,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainOperationResult(alarmId: String) = launch({ @@ -119,7 +113,6 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt index fbf2588..05503e2 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt @@ -1,26 +1,29 @@ package com.casic.qd.smartwell.utils; -import android.content.Context +import android.app.Activity +import android.view.WindowManager import com.qmuiteam.qmui.widget.dialog.QMUITipDialog object DialogHelper { - private var loadingDialog: QMUITipDialog? = null + private lateinit var loadingDialog: QMUITipDialog - fun showLoadingDialog(context: Context?, message: String?) { - if (loadingDialog == null) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) + .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) + .setTipWord(message) + .create() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } } - loadingDialog!!.show() } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt index f39c6ce..43dfa3a 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -18,7 +17,6 @@ class AlarmViewModel : BaseViewModel() { - private val kTag = "AlarmViewModel" private val gson = Gson() val typeModel = MutableLiveData() val contentModel = MutableLiveData() @@ -36,8 +34,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainAlarmContent(type: String) = launch({ @@ -51,8 +48,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainAlarmList( @@ -84,8 +80,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -102,8 +97,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainOperationResult(alarmId: String) = launch({ @@ -119,7 +113,6 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt index c337e59..ef04822 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -14,7 +13,6 @@ class AreaViewModel : BaseViewModel() { - private val kTag = "AreaViewModel" private val gson = Gson() val areaModel = MutableLiveData() @@ -29,7 +27,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt index fbf2588..05503e2 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt @@ -1,26 +1,29 @@ package com.casic.qd.smartwell.utils; -import android.content.Context +import android.app.Activity +import android.view.WindowManager import com.qmuiteam.qmui.widget.dialog.QMUITipDialog object DialogHelper { - private var loadingDialog: QMUITipDialog? = null + private lateinit var loadingDialog: QMUITipDialog - fun showLoadingDialog(context: Context?, message: String?) { - if (loadingDialog == null) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) + .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) + .setTipWord(message) + .create() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } } - loadingDialog!!.show() } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt index f39c6ce..43dfa3a 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -18,7 +17,6 @@ class AlarmViewModel : BaseViewModel() { - private val kTag = "AlarmViewModel" private val gson = Gson() val typeModel = MutableLiveData() val contentModel = MutableLiveData() @@ -36,8 +34,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainAlarmContent(type: String) = launch({ @@ -51,8 +48,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainAlarmList( @@ -84,8 +80,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -102,8 +97,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainOperationResult(alarmId: String) = launch({ @@ -119,7 +113,6 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt index c337e59..ef04822 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -14,7 +13,6 @@ class AreaViewModel : BaseViewModel() { - private val kTag = "AreaViewModel" private val gson = Gson() val areaModel = MutableLiveData() @@ -29,7 +27,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt index e688aa7..3aaa8a7 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.* @@ -16,7 +15,6 @@ class AuthenticateViewModel : BaseViewModel() { - private val kTag = "AuthenticateViewModel" private val gson = Gson() val keyModel = MutableLiveData() val resultModel = MutableLiveData() @@ -25,8 +23,7 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainAuthorByDept() = launch({ @@ -46,8 +43,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -64,7 +60,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt index fbf2588..05503e2 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt @@ -1,26 +1,29 @@ package com.casic.qd.smartwell.utils; -import android.content.Context +import android.app.Activity +import android.view.WindowManager import com.qmuiteam.qmui.widget.dialog.QMUITipDialog object DialogHelper { - private var loadingDialog: QMUITipDialog? = null + private lateinit var loadingDialog: QMUITipDialog - fun showLoadingDialog(context: Context?, message: String?) { - if (loadingDialog == null) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) + .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) + .setTipWord(message) + .create() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } } - loadingDialog!!.show() } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt index f39c6ce..43dfa3a 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -18,7 +17,6 @@ class AlarmViewModel : BaseViewModel() { - private val kTag = "AlarmViewModel" private val gson = Gson() val typeModel = MutableLiveData() val contentModel = MutableLiveData() @@ -36,8 +34,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainAlarmContent(type: String) = launch({ @@ -51,8 +48,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainAlarmList( @@ -84,8 +80,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -102,8 +97,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainOperationResult(alarmId: String) = launch({ @@ -119,7 +113,6 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt index c337e59..ef04822 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -14,7 +13,6 @@ class AreaViewModel : BaseViewModel() { - private val kTag = "AreaViewModel" private val gson = Gson() val areaModel = MutableLiveData() @@ -29,7 +27,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt index e688aa7..3aaa8a7 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.* @@ -16,7 +15,6 @@ class AuthenticateViewModel : BaseViewModel() { - private val kTag = "AuthenticateViewModel" private val gson = Gson() val keyModel = MutableLiveData() val resultModel = MutableLiveData() @@ -25,8 +23,7 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainAuthorByDept() = launch({ @@ -46,8 +43,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -64,7 +60,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/DeviceViewModel.kt index ac4cc02..b1f9fc3 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/DeviceViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -15,7 +14,6 @@ class DeviceViewModel : BaseViewModel() { - private val kTag = "DeviceViewModel" private val gson = Gson() val resultModel = MutableLiveData() val typeModel = MutableLiveData() @@ -38,8 +36,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -56,8 +53,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -74,8 +70,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -92,8 +87,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -114,8 +108,7 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainMapDeviceResult(keywords: String?, devType: String?) = launch({ @@ -129,7 +122,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt index fbf2588..05503e2 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt @@ -1,26 +1,29 @@ package com.casic.qd.smartwell.utils; -import android.content.Context +import android.app.Activity +import android.view.WindowManager import com.qmuiteam.qmui.widget.dialog.QMUITipDialog object DialogHelper { - private var loadingDialog: QMUITipDialog? = null + private lateinit var loadingDialog: QMUITipDialog - fun showLoadingDialog(context: Context?, message: String?) { - if (loadingDialog == null) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) + .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) + .setTipWord(message) + .create() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } } - loadingDialog!!.show() } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt index f39c6ce..43dfa3a 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -18,7 +17,6 @@ class AlarmViewModel : BaseViewModel() { - private val kTag = "AlarmViewModel" private val gson = Gson() val typeModel = MutableLiveData() val contentModel = MutableLiveData() @@ -36,8 +34,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainAlarmContent(type: String) = launch({ @@ -51,8 +48,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainAlarmList( @@ -84,8 +80,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -102,8 +97,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainOperationResult(alarmId: String) = launch({ @@ -119,7 +113,6 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt index c337e59..ef04822 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -14,7 +13,6 @@ class AreaViewModel : BaseViewModel() { - private val kTag = "AreaViewModel" private val gson = Gson() val areaModel = MutableLiveData() @@ -29,7 +27,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt index e688aa7..3aaa8a7 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.* @@ -16,7 +15,6 @@ class AuthenticateViewModel : BaseViewModel() { - private val kTag = "AuthenticateViewModel" private val gson = Gson() val keyModel = MutableLiveData() val resultModel = MutableLiveData() @@ -25,8 +23,7 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainAuthorByDept() = launch({ @@ -46,8 +43,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -64,7 +60,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/DeviceViewModel.kt index ac4cc02..b1f9fc3 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/DeviceViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -15,7 +14,6 @@ class DeviceViewModel : BaseViewModel() { - private val kTag = "DeviceViewModel" private val gson = Gson() val resultModel = MutableLiveData() val typeModel = MutableLiveData() @@ -38,8 +36,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -56,8 +53,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -74,8 +70,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -92,8 +87,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -114,8 +108,7 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainMapDeviceResult(keywords: String?, devType: String?) = launch({ @@ -129,7 +122,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/LoginViewModel.kt index 69adbb6..16157db 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/LoginViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/LoginViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -15,7 +14,6 @@ class LoginViewModel : BaseViewModel() { - private val kTag = "LoginViewModel" private val gson = Gson() val resultModel = MutableLiveData() @@ -33,8 +31,7 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun out() = launch({ @@ -48,7 +45,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt index fbf2588..05503e2 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt @@ -1,26 +1,29 @@ package com.casic.qd.smartwell.utils; -import android.content.Context +import android.app.Activity +import android.view.WindowManager import com.qmuiteam.qmui.widget.dialog.QMUITipDialog object DialogHelper { - private var loadingDialog: QMUITipDialog? = null + private lateinit var loadingDialog: QMUITipDialog - fun showLoadingDialog(context: Context?, message: String?) { - if (loadingDialog == null) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) + .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) + .setTipWord(message) + .create() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } } - loadingDialog!!.show() } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt index f39c6ce..43dfa3a 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -18,7 +17,6 @@ class AlarmViewModel : BaseViewModel() { - private val kTag = "AlarmViewModel" private val gson = Gson() val typeModel = MutableLiveData() val contentModel = MutableLiveData() @@ -36,8 +34,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainAlarmContent(type: String) = launch({ @@ -51,8 +48,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainAlarmList( @@ -84,8 +80,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -102,8 +97,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainOperationResult(alarmId: String) = launch({ @@ -119,7 +113,6 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt index c337e59..ef04822 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -14,7 +13,6 @@ class AreaViewModel : BaseViewModel() { - private val kTag = "AreaViewModel" private val gson = Gson() val areaModel = MutableLiveData() @@ -29,7 +27,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt index e688aa7..3aaa8a7 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.* @@ -16,7 +15,6 @@ class AuthenticateViewModel : BaseViewModel() { - private val kTag = "AuthenticateViewModel" private val gson = Gson() val keyModel = MutableLiveData() val resultModel = MutableLiveData() @@ -25,8 +23,7 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainAuthorByDept() = launch({ @@ -46,8 +43,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -64,7 +60,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/DeviceViewModel.kt index ac4cc02..b1f9fc3 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/DeviceViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -15,7 +14,6 @@ class DeviceViewModel : BaseViewModel() { - private val kTag = "DeviceViewModel" private val gson = Gson() val resultModel = MutableLiveData() val typeModel = MutableLiveData() @@ -38,8 +36,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -56,8 +53,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -74,8 +70,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -92,8 +87,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -114,8 +108,7 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainMapDeviceResult(keywords: String?, devType: String?) = launch({ @@ -129,7 +122,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/LoginViewModel.kt index 69adbb6..16157db 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/LoginViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/LoginViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -15,7 +14,6 @@ class LoginViewModel : BaseViewModel() { - private val kTag = "LoginViewModel" private val gson = Gson() val resultModel = MutableLiveData() @@ -33,8 +31,7 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun out() = launch({ @@ -48,7 +45,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/SearchResultViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/SearchResultViewModel.kt index f915e14..e007103 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/SearchResultViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/SearchResultViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -16,7 +15,6 @@ class SearchResultViewModel : BaseViewModel() { - private val kTag = "SearchResultViewModel" private val gson = Gson() val alarmResultModel = MutableLiveData() val deviceResultModel = MutableLiveData() @@ -47,8 +45,7 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainDeviceResult( @@ -75,7 +72,6 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt index fbf2588..05503e2 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt @@ -1,26 +1,29 @@ package com.casic.qd.smartwell.utils; -import android.content.Context +import android.app.Activity +import android.view.WindowManager import com.qmuiteam.qmui.widget.dialog.QMUITipDialog object DialogHelper { - private var loadingDialog: QMUITipDialog? = null + private lateinit var loadingDialog: QMUITipDialog - fun showLoadingDialog(context: Context?, message: String?) { - if (loadingDialog == null) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) + .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) + .setTipWord(message) + .create() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } } - loadingDialog!!.show() } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt index f39c6ce..43dfa3a 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -18,7 +17,6 @@ class AlarmViewModel : BaseViewModel() { - private val kTag = "AlarmViewModel" private val gson = Gson() val typeModel = MutableLiveData() val contentModel = MutableLiveData() @@ -36,8 +34,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainAlarmContent(type: String) = launch({ @@ -51,8 +48,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainAlarmList( @@ -84,8 +80,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -102,8 +97,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainOperationResult(alarmId: String) = launch({ @@ -119,7 +113,6 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt index c337e59..ef04822 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -14,7 +13,6 @@ class AreaViewModel : BaseViewModel() { - private val kTag = "AreaViewModel" private val gson = Gson() val areaModel = MutableLiveData() @@ -29,7 +27,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt index e688aa7..3aaa8a7 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.* @@ -16,7 +15,6 @@ class AuthenticateViewModel : BaseViewModel() { - private val kTag = "AuthenticateViewModel" private val gson = Gson() val keyModel = MutableLiveData() val resultModel = MutableLiveData() @@ -25,8 +23,7 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainAuthorByDept() = launch({ @@ -46,8 +43,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -64,7 +60,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/DeviceViewModel.kt index ac4cc02..b1f9fc3 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/DeviceViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -15,7 +14,6 @@ class DeviceViewModel : BaseViewModel() { - private val kTag = "DeviceViewModel" private val gson = Gson() val resultModel = MutableLiveData() val typeModel = MutableLiveData() @@ -38,8 +36,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -56,8 +53,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -74,8 +70,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -92,8 +87,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -114,8 +108,7 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainMapDeviceResult(keywords: String?, devType: String?) = launch({ @@ -129,7 +122,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/LoginViewModel.kt index 69adbb6..16157db 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/LoginViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/LoginViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -15,7 +14,6 @@ class LoginViewModel : BaseViewModel() { - private val kTag = "LoginViewModel" private val gson = Gson() val resultModel = MutableLiveData() @@ -33,8 +31,7 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun out() = launch({ @@ -48,7 +45,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/SearchResultViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/SearchResultViewModel.kt index f915e14..e007103 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/SearchResultViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/SearchResultViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -16,7 +15,6 @@ class SearchResultViewModel : BaseViewModel() { - private val kTag = "SearchResultViewModel" private val gson = Gson() val alarmResultModel = MutableLiveData() val deviceResultModel = MutableLiveData() @@ -47,8 +45,7 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainDeviceResult( @@ -75,7 +72,6 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/UserDetailViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/UserDetailViewModel.kt index 91c39d9..dd0a69f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/UserDetailViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/UserDetailViewModel.kt @@ -1,11 +1,9 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch import com.casic.qd.smartwell.extensions.separateResponseCode -import com.casic.qd.smartwell.extensions.show import com.casic.qd.smartwell.model.UserDetailModel import com.casic.qd.smartwell.utils.Constant import com.casic.qd.smartwell.utils.SaveKeyValues @@ -15,7 +13,6 @@ class UserDetailViewModel : BaseViewModel() { - private val kTag = "UserDetailViewModel" private val gson = Gson() //用户信息不用现取现用，布尔值标志用户token是否失效 @@ -36,7 +33,6 @@ flag.value = false } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt index fbf2588..05503e2 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt @@ -1,26 +1,29 @@ package com.casic.qd.smartwell.utils; -import android.content.Context +import android.app.Activity +import android.view.WindowManager import com.qmuiteam.qmui.widget.dialog.QMUITipDialog object DialogHelper { - private var loadingDialog: QMUITipDialog? = null + private lateinit var loadingDialog: QMUITipDialog - fun showLoadingDialog(context: Context?, message: String?) { - if (loadingDialog == null) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) + .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) + .setTipWord(message) + .create() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } } - loadingDialog!!.show() } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt index f39c6ce..43dfa3a 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -18,7 +17,6 @@ class AlarmViewModel : BaseViewModel() { - private val kTag = "AlarmViewModel" private val gson = Gson() val typeModel = MutableLiveData() val contentModel = MutableLiveData() @@ -36,8 +34,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainAlarmContent(type: String) = launch({ @@ -51,8 +48,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainAlarmList( @@ -84,8 +80,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -102,8 +97,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainOperationResult(alarmId: String) = launch({ @@ -119,7 +113,6 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt index c337e59..ef04822 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -14,7 +13,6 @@ class AreaViewModel : BaseViewModel() { - private val kTag = "AreaViewModel" private val gson = Gson() val areaModel = MutableLiveData() @@ -29,7 +27,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt index e688aa7..3aaa8a7 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.* @@ -16,7 +15,6 @@ class AuthenticateViewModel : BaseViewModel() { - private val kTag = "AuthenticateViewModel" private val gson = Gson() val keyModel = MutableLiveData() val resultModel = MutableLiveData() @@ -25,8 +23,7 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainAuthorByDept() = launch({ @@ -46,8 +43,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -64,7 +60,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/DeviceViewModel.kt index ac4cc02..b1f9fc3 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/DeviceViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -15,7 +14,6 @@ class DeviceViewModel : BaseViewModel() { - private val kTag = "DeviceViewModel" private val gson = Gson() val resultModel = MutableLiveData() val typeModel = MutableLiveData() @@ -38,8 +36,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -56,8 +53,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -74,8 +70,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -92,8 +87,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -114,8 +108,7 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainMapDeviceResult(keywords: String?, devType: String?) = launch({ @@ -129,7 +122,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/LoginViewModel.kt index 69adbb6..16157db 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/LoginViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/LoginViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -15,7 +14,6 @@ class LoginViewModel : BaseViewModel() { - private val kTag = "LoginViewModel" private val gson = Gson() val resultModel = MutableLiveData() @@ -33,8 +31,7 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun out() = launch({ @@ -48,7 +45,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/SearchResultViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/SearchResultViewModel.kt index f915e14..e007103 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/SearchResultViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/SearchResultViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -16,7 +15,6 @@ class SearchResultViewModel : BaseViewModel() { - private val kTag = "SearchResultViewModel" private val gson = Gson() val alarmResultModel = MutableLiveData() val deviceResultModel = MutableLiveData() @@ -47,8 +45,7 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainDeviceResult( @@ -75,7 +72,6 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/UserDetailViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/UserDetailViewModel.kt index 91c39d9..dd0a69f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/UserDetailViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/UserDetailViewModel.kt @@ -1,11 +1,9 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch import com.casic.qd.smartwell.extensions.separateResponseCode -import com.casic.qd.smartwell.extensions.show import com.casic.qd.smartwell.model.UserDetailModel import com.casic.qd.smartwell.utils.Constant import com.casic.qd.smartwell.utils.SaveKeyValues @@ -15,7 +13,6 @@ class UserDetailViewModel : BaseViewModel() { - private val kTag = "UserDetailViewModel" private val gson = Gson() //用户信息不用现取现用，布尔值标志用户token是否失效 @@ -36,7 +33,6 @@ flag.value = false } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/WaterStatisticsViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/WaterStatisticsViewModel.kt index d2da377..3ea4525 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/WaterStatisticsViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/WaterStatisticsViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -16,7 +15,6 @@ class WaterStatisticsViewModel : BaseViewModel() { - private val kTag = "WaterStatisticsViewModel" private val gson = Gson() val resultModel = MutableLiveData>() val dayDataModel = MutableLiveData() @@ -43,8 +41,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -61,8 +58,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -79,7 +75,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt index fbf2588..05503e2 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/DialogHelper.kt @@ -1,26 +1,29 @@ package com.casic.qd.smartwell.utils; -import android.content.Context +import android.app.Activity +import android.view.WindowManager import com.qmuiteam.qmui.widget.dialog.QMUITipDialog object DialogHelper { - private var loadingDialog: QMUITipDialog? = null + private lateinit var loadingDialog: QMUITipDialog - fun showLoadingDialog(context: Context?, message: String?) { - if (loadingDialog == null) { - loadingDialog = QMUITipDialog.Builder(context) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) + .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) + .setTipWord(message) + .create() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } } - loadingDialog!!.show() } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt index f39c6ce..43dfa3a 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AlarmViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -18,7 +17,6 @@ class AlarmViewModel : BaseViewModel() { - private val kTag = "AlarmViewModel" private val gson = Gson() val typeModel = MutableLiveData() val contentModel = MutableLiveData() @@ -36,8 +34,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainAlarmContent(type: String) = launch({ @@ -51,8 +48,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainAlarmList( @@ -84,8 +80,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -102,8 +97,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainOperationResult(alarmId: String) = launch({ @@ -119,7 +113,6 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt index c337e59..ef04822 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AreaViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -14,7 +13,6 @@ class AreaViewModel : BaseViewModel() { - private val kTag = "AreaViewModel" private val gson = Gson() val areaModel = MutableLiveData() @@ -29,7 +27,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt index e688aa7..3aaa8a7 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.* @@ -16,7 +15,6 @@ class AuthenticateViewModel : BaseViewModel() { - private val kTag = "AuthenticateViewModel" private val gson = Gson() val keyModel = MutableLiveData() val resultModel = MutableLiveData() @@ -25,8 +23,7 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainAuthorByDept() = launch({ @@ -46,8 +43,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -64,7 +60,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/DeviceViewModel.kt index ac4cc02..b1f9fc3 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/DeviceViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -15,7 +14,6 @@ class DeviceViewModel : BaseViewModel() { - private val kTag = "DeviceViewModel" private val gson = Gson() val resultModel = MutableLiveData() val typeModel = MutableLiveData() @@ -38,8 +36,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -56,8 +53,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -74,8 +70,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -92,8 +87,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -114,8 +108,7 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainMapDeviceResult(keywords: String?, devType: String?) = launch({ @@ -129,7 +122,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/LoginViewModel.kt index 69adbb6..16157db 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/LoginViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/LoginViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -15,7 +14,6 @@ class LoginViewModel : BaseViewModel() { - private val kTag = "LoginViewModel" private val gson = Gson() val resultModel = MutableLiveData() @@ -33,8 +31,7 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun out() = launch({ @@ -48,7 +45,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/SearchResultViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/SearchResultViewModel.kt index f915e14..e007103 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/SearchResultViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/SearchResultViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -16,7 +15,6 @@ class SearchResultViewModel : BaseViewModel() { - private val kTag = "SearchResultViewModel" private val gson = Gson() val alarmResultModel = MutableLiveData() val deviceResultModel = MutableLiveData() @@ -47,8 +45,7 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) fun obtainDeviceResult( @@ -75,7 +72,6 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/UserDetailViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/UserDetailViewModel.kt index 91c39d9..dd0a69f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/UserDetailViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/UserDetailViewModel.kt @@ -1,11 +1,9 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch import com.casic.qd.smartwell.extensions.separateResponseCode -import com.casic.qd.smartwell.extensions.show import com.casic.qd.smartwell.model.UserDetailModel import com.casic.qd.smartwell.utils.Constant import com.casic.qd.smartwell.utils.SaveKeyValues @@ -15,7 +13,6 @@ class UserDetailViewModel : BaseViewModel() { - private val kTag = "UserDetailViewModel" private val gson = Gson() //用户信息不用现取现用，布尔值标志用户token是否失效 @@ -36,7 +33,6 @@ flag.value = false } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/WaterStatisticsViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/WaterStatisticsViewModel.kt index d2da377..3ea4525 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/WaterStatisticsViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/WaterStatisticsViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -16,7 +15,6 @@ class WaterStatisticsViewModel : BaseViewModel() { - private val kTag = "WaterStatisticsViewModel" private val gson = Gson() val resultModel = MutableLiveData>() val dayDataModel = MutableLiveData() @@ -43,8 +41,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -61,8 +58,7 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) /** @@ -79,7 +75,6 @@ response.toErrorMessage().show() } }, { - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/WellDetailViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/WellDetailViewModel.kt index 2613466..f89c269 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/WellDetailViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/WellDetailViewModel.kt @@ -1,6 +1,5 @@ package com.casic.qd.smartwell.vm -import android.util.Log import androidx.lifecycle.MutableLiveData import com.casic.qd.smartwell.base.BaseViewModel import com.casic.qd.smartwell.extensions.launch @@ -15,7 +14,6 @@ class WellDetailViewModel : BaseViewModel() { - private val kTag = "WellDetailViewModel" private val gson = Gson() val detailModel = MutableLiveData() @@ -34,7 +32,6 @@ } }, { loadState.value = LoadState.Fail - Log.e(kTag, it.toString(), it) - "服务器异常".show() + it.printStackTrace() }) } \ No newline at end of file