diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt index 52ebd30..0738ae4 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt index 52ebd30..0738ae4 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt index 2b34428..4d56dbc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt @@ -71,7 +71,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -151,7 +151,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -172,7 +172,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt index 52ebd30..0738ae4 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt index 2b34428..4d56dbc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt @@ -71,7 +71,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -151,7 +151,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -172,7 +172,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt index b958522..04da7f8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt index 52ebd30..0738ae4 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt index 2b34428..4d56dbc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt @@ -71,7 +71,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -151,7 +151,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -172,7 +172,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt index b958522..04da7f8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt index cb14d1e..e8e28dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt index 52ebd30..0738ae4 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt index 2b34428..4d56dbc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt @@ -71,7 +71,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -151,7 +151,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -172,7 +172,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt index b958522..04da7f8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt index cb14d1e..e8e28dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 8c42541..a7b32f6 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -1,10 +1,8 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.PublicKeyModel import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager @@ -17,6 +15,6 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt index 52ebd30..0738ae4 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt index 2b34428..4d56dbc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt @@ -71,7 +71,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -151,7 +151,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -172,7 +172,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt index b958522..04da7f8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt index cb14d1e..e8e28dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 8c42541..a7b32f6 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -1,10 +1,8 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.PublicKeyModel import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager @@ -17,6 +15,6 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt index 486d958..5fd0523 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "修改成功，请重新登录".show(BaseApplication.obtainInstance()) + "修改成功，请重新登录".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt index 52ebd30..0738ae4 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt index 2b34428..4d56dbc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt @@ -71,7 +71,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -151,7 +151,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -172,7 +172,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt index b958522..04da7f8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt index cb14d1e..e8e28dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 8c42541..a7b32f6 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -1,10 +1,8 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.PublicKeyModel import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager @@ -17,6 +15,6 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt index 486d958..5fd0523 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "修改成功，请重新登录".show(BaseApplication.obtainInstance()) + "修改成功，请重新登录".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt index ba30614..c41ac9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt index 52ebd30..0738ae4 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt index 2b34428..4d56dbc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt @@ -71,7 +71,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -151,7 +151,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -172,7 +172,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt index b958522..04da7f8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt index cb14d1e..e8e28dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 8c42541..a7b32f6 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -1,10 +1,8 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.PublicKeyModel import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager @@ -17,6 +15,6 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt index 486d958..5fd0523 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "修改成功，请重新登录".show(BaseApplication.obtainInstance()) + "修改成功，请重新登录".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt index ba30614..c41ac9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt index 8858d26..031a671 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -21,13 +20,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt index 52ebd30..0738ae4 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt index 2b34428..4d56dbc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt @@ -71,7 +71,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -151,7 +151,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -172,7 +172,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt index b958522..04da7f8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt index cb14d1e..e8e28dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 8c42541..a7b32f6 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -1,10 +1,8 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.PublicKeyModel import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager @@ -17,6 +15,6 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt index 486d958..5fd0523 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "修改成功，请重新登录".show(BaseApplication.obtainInstance()) + "修改成功，请重新登录".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt index ba30614..c41ac9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt index 8858d26..031a671 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -21,13 +20,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt index 144447f..7e2a212 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,10 +27,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt index 52ebd30..0738ae4 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt index 2b34428..4d56dbc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt @@ -71,7 +71,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -151,7 +151,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -172,7 +172,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt index b958522..04da7f8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt index cb14d1e..e8e28dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 8c42541..a7b32f6 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -1,10 +1,8 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.PublicKeyModel import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager @@ -17,6 +15,6 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt index 486d958..5fd0523 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "修改成功，请重新登录".show(BaseApplication.obtainInstance()) + "修改成功，请重新登录".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt index ba30614..c41ac9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt index 8858d26..031a671 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -21,13 +20,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt index 144447f..7e2a212 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,10 +27,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt index 6e43adc..d42c132 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt index 52ebd30..0738ae4 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt index 2b34428..4d56dbc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt @@ -71,7 +71,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -151,7 +151,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -172,7 +172,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt index b958522..04da7f8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt index cb14d1e..e8e28dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 8c42541..a7b32f6 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -1,10 +1,8 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.PublicKeyModel import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager @@ -17,6 +15,6 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt index 486d958..5fd0523 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "修改成功，请重新登录".show(BaseApplication.obtainInstance()) + "修改成功，请重新登录".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt index ba30614..c41ac9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt index 8858d26..031a671 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -21,13 +20,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt index 144447f..7e2a212 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,10 +27,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt index 6e43adc..d42c132 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt index 7ffd854..4cdfd84 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt index 52ebd30..0738ae4 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt index 2b34428..4d56dbc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt @@ -71,7 +71,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -151,7 +151,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -172,7 +172,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt index b958522..04da7f8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt index cb14d1e..e8e28dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 8c42541..a7b32f6 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -1,10 +1,8 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.PublicKeyModel import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager @@ -17,6 +15,6 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt index 486d958..5fd0523 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "修改成功，请重新登录".show(BaseApplication.obtainInstance()) + "修改成功，请重新登录".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt index ba30614..c41ac9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt index 8858d26..031a671 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -21,13 +20,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt index 144447f..7e2a212 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,10 +27,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt index 6e43adc..d42c132 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt index 7ffd854..4cdfd84 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt index 5043c3b..605304c 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -39,10 +38,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt index 52ebd30..0738ae4 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt index 2b34428..4d56dbc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt @@ -71,7 +71,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -151,7 +151,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -172,7 +172,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt index b958522..04da7f8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt index cb14d1e..e8e28dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 8c42541..a7b32f6 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -1,10 +1,8 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.PublicKeyModel import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager @@ -17,6 +15,6 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt index 486d958..5fd0523 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "修改成功，请重新登录".show(BaseApplication.obtainInstance()) + "修改成功，请重新登录".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt index ba30614..c41ac9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt index 8858d26..031a671 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -21,13 +20,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt index 144447f..7e2a212 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,10 +27,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt index 6e43adc..d42c132 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt index 7ffd854..4cdfd84 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt index 5043c3b..605304c 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -39,10 +38,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt index 5540d7b..ef19e7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,9 +27,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt index 52ebd30..0738ae4 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt index 2b34428..4d56dbc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt @@ -71,7 +71,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -151,7 +151,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -172,7 +172,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt index b958522..04da7f8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt index cb14d1e..e8e28dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 8c42541..a7b32f6 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -1,10 +1,8 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.PublicKeyModel import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager @@ -17,6 +15,6 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt index 486d958..5fd0523 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "修改成功，请重新登录".show(BaseApplication.obtainInstance()) + "修改成功，请重新登录".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt index ba30614..c41ac9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt index 8858d26..031a671 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -21,13 +20,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt index 144447f..7e2a212 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,10 +27,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt index 6e43adc..d42c132 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt index 7ffd854..4cdfd84 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt index 5043c3b..605304c 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -39,10 +38,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt index 5540d7b..ef19e7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,9 +27,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt index 35146bf..617eb81 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "转单成功".show(BaseApplication.obtainInstance()) + "转单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt index 52ebd30..0738ae4 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt index 2b34428..4d56dbc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt @@ -71,7 +71,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -151,7 +151,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -172,7 +172,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt index b958522..04da7f8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt index cb14d1e..e8e28dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 8c42541..a7b32f6 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -1,10 +1,8 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.PublicKeyModel import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager @@ -17,6 +15,6 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt index 486d958..5fd0523 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "修改成功，请重新登录".show(BaseApplication.obtainInstance()) + "修改成功，请重新登录".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt index ba30614..c41ac9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt index 8858d26..031a671 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -21,13 +20,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt index 144447f..7e2a212 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,10 +27,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt index 6e43adc..d42c132 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt index 7ffd854..4cdfd84 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt index 5043c3b..605304c 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -39,10 +38,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt index 5540d7b..ef19e7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,9 +27,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt index 35146bf..617eb81 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "转单成功".show(BaseApplication.obtainInstance()) + "转单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt index 8c6414d..dfd3660 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ).data } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt index 52ebd30..0738ae4 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt index 2b34428..4d56dbc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt @@ -71,7 +71,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -151,7 +151,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -172,7 +172,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt index b958522..04da7f8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt index cb14d1e..e8e28dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 8c42541..a7b32f6 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -1,10 +1,8 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.PublicKeyModel import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager @@ -17,6 +15,6 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt index 486d958..5fd0523 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "修改成功，请重新登录".show(BaseApplication.obtainInstance()) + "修改成功，请重新登录".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt index ba30614..c41ac9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt index 8858d26..031a671 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -21,13 +20,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt index 144447f..7e2a212 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,10 +27,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt index 6e43adc..d42c132 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt index 7ffd854..4cdfd84 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt index 5043c3b..605304c 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -39,10 +38,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt index 5540d7b..ef19e7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,9 +27,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt index 35146bf..617eb81 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "转单成功".show(BaseApplication.obtainInstance()) + "转单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt index 8c6414d..dfd3660 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ).data } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt index 7f245b9..4ee0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt index 52ebd30..0738ae4 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt index 2b34428..4d56dbc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt @@ -71,7 +71,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -151,7 +151,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -172,7 +172,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt index b958522..04da7f8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt index cb14d1e..e8e28dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 8c42541..a7b32f6 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -1,10 +1,8 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.PublicKeyModel import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager @@ -17,6 +15,6 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt index 486d958..5fd0523 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "修改成功，请重新登录".show(BaseApplication.obtainInstance()) + "修改成功，请重新登录".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt index ba30614..c41ac9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt index 8858d26..031a671 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -21,13 +20,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt index 144447f..7e2a212 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,10 +27,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt index 6e43adc..d42c132 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt index 7ffd854..4cdfd84 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt index 5043c3b..605304c 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -39,10 +38,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt index 5540d7b..ef19e7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,9 +27,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt index 35146bf..617eb81 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "转单成功".show(BaseApplication.obtainInstance()) + "转单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt index 8c6414d..dfd3660 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ).data } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt index 7f245b9..4ee0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt index 80e8535..60c0f39 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt @@ -1,11 +1,9 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.UserDetailModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.SaveKeyValues @@ -35,6 +33,6 @@ flag.value = false } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt index 52ebd30..0738ae4 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt index 2b34428..4d56dbc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt @@ -71,7 +71,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -151,7 +151,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -172,7 +172,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt index b958522..04da7f8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt index cb14d1e..e8e28dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 8c42541..a7b32f6 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -1,10 +1,8 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.PublicKeyModel import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager @@ -17,6 +15,6 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt index 486d958..5fd0523 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "修改成功，请重新登录".show(BaseApplication.obtainInstance()) + "修改成功，请重新登录".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt index ba30614..c41ac9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt index 8858d26..031a671 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -21,13 +20,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt index 144447f..7e2a212 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,10 +27,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt index 6e43adc..d42c132 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt index 7ffd854..4cdfd84 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt index 5043c3b..605304c 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -39,10 +38,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt index 5540d7b..ef19e7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,9 +27,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt index 35146bf..617eb81 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "转单成功".show(BaseApplication.obtainInstance()) + "转单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt index 8c6414d..dfd3660 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ).data } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt index 7f245b9..4ee0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt index 80e8535..60c0f39 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt @@ -1,11 +1,9 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.UserDetailModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.SaveKeyValues @@ -35,6 +33,6 @@ flag.value = false } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt index 0df853e..3e573eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -27,9 +26,9 @@ map["total"] = data.getString("total") resultModel.value = map } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt index 52ebd30..0738ae4 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt index 2b34428..4d56dbc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt @@ -71,7 +71,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -151,7 +151,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -172,7 +172,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt index b958522..04da7f8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt index cb14d1e..e8e28dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 8c42541..a7b32f6 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -1,10 +1,8 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.PublicKeyModel import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager @@ -17,6 +15,6 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt index 486d958..5fd0523 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "修改成功，请重新登录".show(BaseApplication.obtainInstance()) + "修改成功，请重新登录".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt index ba30614..c41ac9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt index 8858d26..031a671 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -21,13 +20,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt index 144447f..7e2a212 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,10 +27,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt index 6e43adc..d42c132 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt index 7ffd854..4cdfd84 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt index 5043c3b..605304c 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -39,10 +38,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt index 5540d7b..ef19e7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,9 +27,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt index 35146bf..617eb81 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "转单成功".show(BaseApplication.obtainInstance()) + "转单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt index 8c6414d..dfd3660 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ).data } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt index 7f245b9..4ee0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt index 80e8535..60c0f39 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt @@ -1,11 +1,9 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.UserDetailModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.SaveKeyValues @@ -35,6 +33,6 @@ flag.value = false } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt index 0df853e..3e573eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -27,9 +26,9 @@ map["total"] = data.getString("total") resultModel.value = map } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt index 283ad24..6810546 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt index 52ebd30..0738ae4 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt index 2b34428..4d56dbc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt @@ -71,7 +71,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -151,7 +151,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -172,7 +172,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt index b958522..04da7f8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt index cb14d1e..e8e28dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 8c42541..a7b32f6 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -1,10 +1,8 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.PublicKeyModel import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager @@ -17,6 +15,6 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt index 486d958..5fd0523 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "修改成功，请重新登录".show(BaseApplication.obtainInstance()) + "修改成功，请重新登录".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt index ba30614..c41ac9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt index 8858d26..031a671 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -21,13 +20,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt index 144447f..7e2a212 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,10 +27,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt index 6e43adc..d42c132 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt index 7ffd854..4cdfd84 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt index 5043c3b..605304c 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -39,10 +38,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt index 5540d7b..ef19e7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,9 +27,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt index 35146bf..617eb81 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "转单成功".show(BaseApplication.obtainInstance()) + "转单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt index 8c6414d..dfd3660 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ).data } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt index 7f245b9..4ee0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt index 80e8535..60c0f39 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt @@ -1,11 +1,9 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.UserDetailModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.SaveKeyValues @@ -35,6 +33,6 @@ flag.value = false } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt index 0df853e..3e573eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -27,9 +26,9 @@ map["total"] = data.getString("total") resultModel.value = map } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt index 283ad24..6810546 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 053d6c3..a5e53e0 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -33,10 +32,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) fun obtainAllWell() = launch({ @@ -47,9 +46,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt index 52ebd30..0738ae4 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt index 2b34428..4d56dbc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt @@ -71,7 +71,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -151,7 +151,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -172,7 +172,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt index b958522..04da7f8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt index cb14d1e..e8e28dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 8c42541..a7b32f6 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -1,10 +1,8 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.PublicKeyModel import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager @@ -17,6 +15,6 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt index 486d958..5fd0523 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "修改成功，请重新登录".show(BaseApplication.obtainInstance()) + "修改成功，请重新登录".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt index ba30614..c41ac9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt index 8858d26..031a671 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -21,13 +20,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt index 144447f..7e2a212 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,10 +27,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt index 6e43adc..d42c132 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt index 7ffd854..4cdfd84 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt index 5043c3b..605304c 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -39,10 +38,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt index 5540d7b..ef19e7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,9 +27,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt index 35146bf..617eb81 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "转单成功".show(BaseApplication.obtainInstance()) + "转单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt index 8c6414d..dfd3660 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ).data } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt index 7f245b9..4ee0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt index 80e8535..60c0f39 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt @@ -1,11 +1,9 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.UserDetailModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.SaveKeyValues @@ -35,6 +33,6 @@ flag.value = false } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt index 0df853e..3e573eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -27,9 +26,9 @@ map["total"] = data.getString("total") resultModel.value = map } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt index 283ad24..6810546 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 053d6c3..a5e53e0 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -33,10 +32,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) fun obtainAllWell() = launch({ @@ -47,9 +46,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt index 7a8e3a5..7e754b7 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt index 52ebd30..0738ae4 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt index 2b34428..4d56dbc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt @@ -71,7 +71,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -151,7 +151,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -172,7 +172,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt index b958522..04da7f8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt index cb14d1e..e8e28dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 8c42541..a7b32f6 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -1,10 +1,8 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.PublicKeyModel import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager @@ -17,6 +15,6 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt index 486d958..5fd0523 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "修改成功，请重新登录".show(BaseApplication.obtainInstance()) + "修改成功，请重新登录".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt index ba30614..c41ac9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt index 8858d26..031a671 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -21,13 +20,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt index 144447f..7e2a212 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,10 +27,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt index 6e43adc..d42c132 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt index 7ffd854..4cdfd84 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt index 5043c3b..605304c 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -39,10 +38,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt index 5540d7b..ef19e7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,9 +27,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt index 35146bf..617eb81 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "转单成功".show(BaseApplication.obtainInstance()) + "转单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt index 8c6414d..dfd3660 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ).data } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt index 7f245b9..4ee0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt index 80e8535..60c0f39 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt @@ -1,11 +1,9 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.UserDetailModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.SaveKeyValues @@ -35,6 +33,6 @@ flag.value = false } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt index 0df853e..3e573eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -27,9 +26,9 @@ map["total"] = data.getString("total") resultModel.value = map } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt index 283ad24..6810546 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 053d6c3..a5e53e0 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -33,10 +32,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) fun obtainAllWell() = launch({ @@ -47,9 +46,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt index 7a8e3a5..7e754b7 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellOperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellOperationViewModel.kt index 1a76400..cdac14c 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellOperationViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellOperationViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -24,16 +23,16 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "操作成功".show(BaseApplication.obtainInstance()) + "操作成功".show() resultModel.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt index 52ebd30..0738ae4 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt index 2b34428..4d56dbc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt @@ -71,7 +71,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -151,7 +151,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -172,7 +172,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt index b958522..04da7f8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt index cb14d1e..e8e28dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 8c42541..a7b32f6 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -1,10 +1,8 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.PublicKeyModel import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager @@ -17,6 +15,6 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt index 486d958..5fd0523 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "修改成功，请重新登录".show(BaseApplication.obtainInstance()) + "修改成功，请重新登录".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt index ba30614..c41ac9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt index 8858d26..031a671 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -21,13 +20,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt index 144447f..7e2a212 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,10 +27,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt index 6e43adc..d42c132 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt index 7ffd854..4cdfd84 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt index 5043c3b..605304c 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -39,10 +38,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt index 5540d7b..ef19e7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,9 +27,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt index 35146bf..617eb81 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "转单成功".show(BaseApplication.obtainInstance()) + "转单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt index 8c6414d..dfd3660 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ).data } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt index 7f245b9..4ee0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt index 80e8535..60c0f39 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt @@ -1,11 +1,9 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.UserDetailModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.SaveKeyValues @@ -35,6 +33,6 @@ flag.value = false } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt index 0df853e..3e573eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -27,9 +26,9 @@ map["total"] = data.getString("total") resultModel.value = map } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt index 283ad24..6810546 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 053d6c3..a5e53e0 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -33,10 +32,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) fun obtainAllWell() = launch({ @@ -47,9 +46,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt index 7a8e3a5..7e754b7 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellOperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellOperationViewModel.kt index 1a76400..cdac14c 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellOperationViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellOperationViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -24,16 +23,16 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "操作成功".show(BaseApplication.obtainInstance()) + "操作成功".show() resultModel.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellTypeViewModel.kt index a55151c..c5c73e9 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt index 52ebd30..0738ae4 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt index 2b34428..4d56dbc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt @@ -71,7 +71,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -151,7 +151,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -172,7 +172,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt index b958522..04da7f8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt index cb14d1e..e8e28dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 8c42541..a7b32f6 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -1,10 +1,8 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.PublicKeyModel import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager @@ -17,6 +15,6 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt index 486d958..5fd0523 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "修改成功，请重新登录".show(BaseApplication.obtainInstance()) + "修改成功，请重新登录".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt index ba30614..c41ac9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt index 8858d26..031a671 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -21,13 +20,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt index 144447f..7e2a212 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,10 +27,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt index 6e43adc..d42c132 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt index 7ffd854..4cdfd84 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt index 5043c3b..605304c 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -39,10 +38,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt index 5540d7b..ef19e7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,9 +27,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt index 35146bf..617eb81 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "转单成功".show(BaseApplication.obtainInstance()) + "转单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt index 8c6414d..dfd3660 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ).data } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt index 7f245b9..4ee0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt index 80e8535..60c0f39 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt @@ -1,11 +1,9 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.UserDetailModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.SaveKeyValues @@ -35,6 +33,6 @@ flag.value = false } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt index 0df853e..3e573eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -27,9 +26,9 @@ map["total"] = data.getString("total") resultModel.value = map } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt index 283ad24..6810546 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 053d6c3..a5e53e0 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -33,10 +32,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) fun obtainAllWell() = launch({ @@ -47,9 +46,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt index 7a8e3a5..7e754b7 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellOperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellOperationViewModel.kt index 1a76400..cdac14c 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellOperationViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellOperationViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -24,16 +23,16 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "操作成功".show(BaseApplication.obtainInstance()) + "操作成功".show() resultModel.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellTypeViewModel.kt index a55151c..c5c73e9 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderDetailViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderDetailViewModel.kt index b17ecad..b3f139c 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderDetailViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderDetailViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt index 52ebd30..0738ae4 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt index 2b34428..4d56dbc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt @@ -71,7 +71,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -151,7 +151,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -172,7 +172,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt index b958522..04da7f8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt index cb14d1e..e8e28dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 8c42541..a7b32f6 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -1,10 +1,8 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.PublicKeyModel import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager @@ -17,6 +15,6 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt index 486d958..5fd0523 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "修改成功，请重新登录".show(BaseApplication.obtainInstance()) + "修改成功，请重新登录".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt index ba30614..c41ac9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt index 8858d26..031a671 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -21,13 +20,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt index 144447f..7e2a212 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,10 +27,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt index 6e43adc..d42c132 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt index 7ffd854..4cdfd84 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt index 5043c3b..605304c 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -39,10 +38,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt index 5540d7b..ef19e7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,9 +27,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt index 35146bf..617eb81 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "转单成功".show(BaseApplication.obtainInstance()) + "转单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt index 8c6414d..dfd3660 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ).data } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt index 7f245b9..4ee0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt index 80e8535..60c0f39 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt @@ -1,11 +1,9 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.UserDetailModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.SaveKeyValues @@ -35,6 +33,6 @@ flag.value = false } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt index 0df853e..3e573eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -27,9 +26,9 @@ map["total"] = data.getString("total") resultModel.value = map } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt index 283ad24..6810546 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 053d6c3..a5e53e0 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -33,10 +32,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) fun obtainAllWell() = launch({ @@ -47,9 +46,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt index 7a8e3a5..7e754b7 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellOperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellOperationViewModel.kt index 1a76400..cdac14c 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellOperationViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellOperationViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -24,16 +23,16 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "操作成功".show(BaseApplication.obtainInstance()) + "操作成功".show() resultModel.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellTypeViewModel.kt index a55151c..c5c73e9 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderDetailViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderDetailViewModel.kt index b17ecad..b3f139c 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderDetailViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderDetailViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt index 98e7ed8..0348686 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,10 +24,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) fun obtainNotAcceptOderList(page: Int) = launch({ @@ -39,10 +38,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) fun obtainNotHandleOderList(page: Int) = launch({ @@ -53,9 +52,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt index 2a89950..4ea982b 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseActivity.kt @@ -26,7 +26,7 @@ if (this.isNetworkConnected()) { setupPage() } else { - "网络好像走丢了～".show(this) + "网络好像走丢了～".show() setContentView(R.layout.empty_page) } } diff --git a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt index cd14d88..1a3de81 100644 --- a/app/src/main/java/com/casic/app/smartwell/extensions/String.kt +++ b/app/src/main/java/com/casic/app/smartwell/extensions/String.kt @@ -1,11 +1,11 @@ package com.casic.app.smartwell.extensions -import android.content.Context import android.graphics.Color import android.view.Gravity import android.widget.TextView import android.widget.Toast import com.casic.app.smartwell.R +import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.model.ErrorMessageModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.FileUtils @@ -26,7 +26,8 @@ */ //将Toast扩展到String -fun String.show(context: Context) { +fun String.show() { + val context = BaseApplication.obtainInstance() val toast = Toast(context) val textView = TextView(context) textView.setBackgroundResource(R.drawable.bg_toast_layout) diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt index 8cfa2a8..2cc0d3b 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DialogHelper.kt @@ -1,24 +1,29 @@ package com.casic.app.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?) { - loadingDialog = QMUITipDialog.Builder(context) + fun showLoadingDialog(activity: Activity, message: String?) { + loadingDialog = QMUITipDialog.Builder(activity) .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) .setTipWord(message) .create() - loadingDialog!!.show() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } } fun dismissLoadingDialog() { - if (loadingDialog != null) { - if (loadingDialog!!.isShowing) { - loadingDialog!!.dismiss() - } + if (loadingDialog.isShowing) { + loadingDialog.dismiss() } } } diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 67102dd..7f95f64 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -38,29 +38,29 @@ * */ val oldPassword: String = oldPasswordView.text.toString().trim() if (oldPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val newPassword: String = newPasswordView.text.toString().trim() if (newPassword.isBlank()) { - "请先输入原密码".show(this) + "请先输入原密码".show() return@setOnClickListener } val repeatPassword: String = repeatPasswordView.text.toString().trim() if (repeatPassword.isBlank()) { - "请再次输入新密码".show(this) + "请再次输入新密码".show() return@setOnClickListener } if (newPassword != repeatPassword) { - "新密码和确认密码输入不一致，请重新输入".show(this) + "新密码和确认密码输入不一致，请重新输入".show() return@setOnClickListener } if (newPassword.length < 8 || newPassword.length > 16) { - "新密码长度不正确，请重新输入".show(this) + "新密码长度不正确，请重新输入".show() return@setOnClickListener } if (!newPassword.isLetterAndDigit()) { - "新密码请输入8-16位的数字字母组合".show(this) + "新密码请输入8-16位的数字字母组合".show() return@setOnClickListener } //数据校验OK，可以修改密码 diff --git a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt index 744cf0b..5923ab6 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/CompletedDetailActivity.kt @@ -108,7 +108,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } diff --git a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt index 74647f5..9891738 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/InHandleDetailActivity.kt @@ -80,7 +80,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -157,7 +157,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -217,7 +217,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -239,20 +239,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入维护情况".show(this) + "请输入维护情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传维护图片".show(this) + "请上传维护图片".show() return@setOnClickListener } //弹窗提示用户 @@ -299,7 +299,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -321,7 +321,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 1af3342..071367c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -75,11 +75,11 @@ val account = userNameView.text.toString().trim() val userPassword = userPasswordView.text.toString().trim() if (account.isBlank()) { - "用户名不能为空".show(this) + "用户名不能为空".show() return@setOnClickListener } if (userPassword.isBlank()) { - "密码不能为空".show(this) + "密码不能为空".show() return@setOnClickListener } SaveKeyValues.putValue(Constant.ACCOUNT, account) @@ -114,17 +114,17 @@ loginInViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Success -> { - "登录成功".show(this) + "登录成功".show() DialogHelper.dismissLoadingDialog() } else -> { - "登录失败，用户名或密码错误".show(this) + "登录失败，用户名或密码错误".show() DialogHelper.dismissLoadingDialog() } } }) } else { - it.message!!.show(this) + it.message!!.show() } }) authenticateViewModel.loadState.observe(this, { diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 02d7ff5..2e09a48 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -81,7 +81,7 @@ override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { return if (keyCode == KeyEvent.KEYCODE_BACK) { if (System.currentTimeMillis() - clickTime > 2000) { - "再按一次退出程序".show(this) + "再按一次退出程序".show() clickTime = System.currentTimeMillis() true } else { diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt index 86cd3c8..278301c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotConfirmedDetailActivity.kt @@ -82,7 +82,7 @@ inputLengthView.text = "${text.length}/100" if (text.length > 100) { inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) + "现场情况字符不能超过100个字符".show() } else { inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) } @@ -170,7 +170,7 @@ override fun onConfirmClick() { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法转单".show(context) + "工单ID异常，无法转单".show() return } transferOrderViewModel.transferWorkOrder( @@ -192,20 +192,20 @@ submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() if (orderId.isBlank()) { - "工单ID异常，无法确认工单".show(this) + "工单ID异常，无法确认工单".show() return@setOnClickListener } val state = sceneEditView.text.toString().trim() if (state.isBlank()) { - "请输入现场情况".show(this) + "请输入现场情况".show() return@setOnClickListener } if (state.length > 100) { - "请输入少于100个字".show(this) + "请输入少于100个字".show() return@setOnClickListener } if (imagePaths.size == 0) { - "请上传现场图片".show(this) + "请上传现场图片".show() return@setOnClickListener } needHandle = when { @@ -216,7 +216,7 @@ "1" } else -> { - "请选择窨井当前情况".show(this) + "请选择窨井当前情况".show() return@setOnClickListener } } @@ -265,7 +265,7 @@ override fun onItemClick(position: Int) { if (realPaths[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, realPaths) } @@ -287,7 +287,7 @@ } imageAdapter.setupImage(images = realPaths) } else { - "最多只能上传3张图片".show(this) + "最多只能上传3张图片".show() } } }) diff --git a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt index 46653e7..ce92dc7 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/NotProcessedDetailActivity.kt @@ -96,7 +96,7 @@ AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show(context) + "工单ID异常，无法接单".show() return } acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) @@ -113,7 +113,7 @@ navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() if (wellId.isBlank()) { - "窨井ID异常，无法导航".show(context) + "窨井ID异常，无法导航".show() return@setOnClickListener } wellDetailViewModel.obtainWellDetail(id = wellId) @@ -124,7 +124,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() } else { Poi( orderDetail.position, diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index 9befab3..71ce12a 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) resultRefreshLayout.finishLoadMore() @@ -129,7 +129,7 @@ TimeLineBottomSheet.Builder().setContext(this) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(this) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -181,7 +181,7 @@ override fun onClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(activity) + "工单编号异常，无法查看详情".show() return } if (activity.dataBeans[position].jobStatus == "0") { @@ -210,7 +210,7 @@ val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(activity) + "工单ID异常，无法接单".show() return } activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) @@ -225,7 +225,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = activity.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(activity) + "工单编号异常，无法查看工单流转记录".show() return } activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt index ca9e06f..f73922e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchWorkOrderActivity.kt @@ -173,7 +173,7 @@ .setType(Type.YEAR_MONTH_DAY) .setCallBack { _: TimePickerDialog?, millSeconds: Long -> if (millSeconds.isEarlierThanStart(startTimeView.text.toString())) { - "结束时间不合法，不能早于开始时间".show(this) + "结束时间不合法，不能早于开始时间".show() return@setCallBack } endTimeView.text = millSeconds.timestampToDate() diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index bca3b97..e63c7cd 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -98,7 +98,7 @@ ImageRecyclerViewAdapter.OnItemClickListener { override fun onItemClick(position: Int) { if (urls[position].isEmpty()) { - "图片加载失败，无法查看大图".show(context) + "图片加载失败，无法查看大图".show() } else { context.navigatePageTo(BigImageActivity::class.java, position, urls) } @@ -111,7 +111,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this) + "窨井经纬度异常，无法开启导航".show() return@setOnClickListener } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index f19d80e..0614793 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -86,7 +86,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) refreshLayout.finishLoadMore() @@ -175,7 +175,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -186,7 +186,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 99182a3..c4d4419 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -92,7 +92,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(this) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) operationRefreshLayout.finishLoadMore() @@ -210,7 +210,7 @@ override fun onClicked(position: Int) { val wellId = activity.dataBeans[position].id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } activity.navigatePageTo(WellDetailActivity::class.java, wellId) @@ -223,7 +223,7 @@ val detailModel = activity.dataBeans[position] val wellId = detailModel.id.toString() if (wellId.isBlank()) { - "井编号异常，无法查看详情".show(activity) + "井编号异常，无法查看详情".show() return } val bfzt = if (detailModel.bfztName == "布防") { @@ -261,7 +261,7 @@ val lat = wellDetail.latGaode.toString() val lng = wellDetail.lngGaode.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(activity) + "窨井经纬度异常，无法开启导航".show() return } Poi( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt index a243c00..a1289ad 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/CompletedOrderFragment.kt @@ -69,7 +69,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) completedOrderLayout.finishLoadMore() @@ -103,7 +103,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -143,7 +143,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -154,7 +154,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt index 6370978..93ac9bc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/HomePageFragment.kt @@ -278,7 +278,7 @@ //显示闸井信息 marker!!.showInfoWindow() } else { - "该位置是定位点，请选择实际闸井点".show(requireContext()) + "该位置是定位点，请选择实际闸井点".show() } } return true @@ -312,7 +312,7 @@ return infoWindow } } - "请不要点击多个位置点".show(requireContext()) + "请不要点击多个位置点".show() return null } @@ -336,7 +336,7 @@ val lat = latLng.latitude.toString() val lng = latLng.longitude.toString() if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(requireContext()) + "窨井经纬度异常，无法开启导航".show() return } Poi(p0.snippet, LatLng(lat.toDouble(), lng.toDouble()), "").showRouteOnMap( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt index cc3be43..bbe0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/InHandleOrderFragment.kt @@ -72,7 +72,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) inHandleLayout.finishLoadMore() @@ -106,7 +106,7 @@ TimeLineBottomSheet.Builder().setContext(requireContext()) .setFlowItems(orderFlow).build().show() } else { - "抱歉，无法查到该工单的流转记录".show(requireContext()) + "抱歉，无法查到该工单的流转记录".show() } } }) @@ -146,7 +146,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -157,7 +157,7 @@ override fun onTransferViewClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show(fragment.requireContext()) + "工单编号异常，无法查看工单流转记录".show() return } fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt index 4f72cf9..ba5122c 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/MinePageFragment.kt @@ -69,7 +69,7 @@ } updateVersionViewModel.resultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { - "已是最新版本，无需更新".show(requireContext()) + "已是最新版本，无需更新".show() } else { AlertControlDialog.Builder() .setContext(requireContext()) @@ -109,7 +109,7 @@ progressDialog.setMessage("下载新版本中...") progressDialog.show() if (url.toString().isBlank()) { - "抱歉，版本下载失败".show(requireContext()) + "抱歉，版本下载失败".show() return } /** @@ -137,7 +137,7 @@ private fun installApk(apkPackage: File?) { if (apkPackage == null) { - "安装文件异常，无法安装".show(requireContext()) + "安装文件异常，无法安装".show() return } val intent = Intent(Intent.ACTION_VIEW) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt index 271428e..9eed587 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotAcceptFragment.kt @@ -75,7 +75,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -155,7 +155,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext() @@ -178,7 +178,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt index 46166cc..3d4b495 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotConfirmedFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt index 52ebd30..0738ae4 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotHandleFragment.kt @@ -68,7 +68,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notConfirmedLayout.finishLoadMore() @@ -129,7 +129,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( diff --git a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt index 2b34428..4d56dbc 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/fragment/NotProcessedFragment.kt @@ -71,7 +71,7 @@ } isLoadMore -> { if (dataRows?.size == 0) { - "到底了，别拉了".show(requireContext()) + "到底了，别拉了".show() } dataBeans.addAll(dataRows!!) notProcessedLayout.finishLoadMore() @@ -151,7 +151,7 @@ override fun onClicked(position: Int) { val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单编号异常，无法查看详情".show(fragment.requireContext()) + "工单编号异常，无法查看详情".show() return } fragment.requireContext().navigatePageTo( @@ -172,7 +172,7 @@ val jobId = fragment.dataBeans[position].jobId.toString() if (jobId.isBlank()) { - "工单ID异常，无法接单".show(fragment.requireContext()) + "工单ID异常，无法接单".show() return } fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt index b958522..04da7f8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt index cb14d1e..e8e28dc 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmContentTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 8c42541..a7b32f6 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -1,10 +1,8 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.PublicKeyModel import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager @@ -17,6 +15,6 @@ loadState.value = LoadState.Loading keyModel.value = RetrofitServiceManager.authenticate() }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt index 486d958..5fd0523 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "修改成功，请重新登录".show(BaseApplication.obtainInstance()) + "修改成功，请重新登录".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt index ba30614..c41ac9f 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt index 8858d26..031a671 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -21,13 +20,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt index 144447f..7e2a212 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginInViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,10 +27,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt index 6e43adc..d42c132 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginOutViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt index 7ffd854..4cdfd84 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt index 5043c3b..605304c 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -39,10 +38,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt index 5540d7b..ef19e7a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,9 +27,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt index 35146bf..617eb81 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt @@ -1,6 +1,5 @@ package com.casic.app.smartwell.vm -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -17,13 +16,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "转单成功".show(BaseApplication.obtainInstance()) + "转单成功".show() } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt index 8c6414d..dfd3660 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ).data } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt index 7f245b9..4ee0c12 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt index 80e8535..60c0f39 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt @@ -1,11 +1,9 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode -import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.model.UserDetailModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.SaveKeyValues @@ -35,6 +33,6 @@ flag.value = false } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt index 0df853e..3e573eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -27,9 +26,9 @@ map["total"] = data.getString("total") resultModel.value = map } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt index 283ad24..6810546 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 053d6c3..a5e53e0 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -33,10 +32,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) fun obtainAllWell() = launch({ @@ -47,9 +46,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt index 7a8e3a5..7e754b7 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellOperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellOperationViewModel.kt index 1a76400..cdac14c 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellOperationViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellOperationViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -24,16 +23,16 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "操作成功".show(BaseApplication.obtainInstance()) + "操作成功".show() resultModel.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellTypeViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellTypeViewModel.kt index a55151c..c5c73e9 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellTypeViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellTypeViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,9 +24,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderDetailViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderDetailViewModel.kt index b17ecad..b3f139c 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderDetailViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderDetailViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -29,10 +28,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { loadState.value = LoadState.Fail - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt index 98e7ed8..0348686 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -25,10 +24,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) fun obtainNotAcceptOderList(page: Int) = launch({ @@ -39,10 +38,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) fun obtainNotHandleOderList(page: Int) = launch({ @@ -53,9 +52,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt index ecfa565..ef8f37c 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt @@ -1,7 +1,6 @@ package com.casic.app.smartwell.vm import androidx.lifecycle.MutableLiveData -import com.casic.app.smartwell.base.BaseApplication import com.casic.app.smartwell.base.BaseViewModel import com.casic.app.smartwell.extensions.launch import com.casic.app.smartwell.extensions.separateResponseCode @@ -28,9 +27,9 @@ map["over"] = data.getString("over") resultModel.value = map } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show() } }, { - "服务器异常".show(BaseApplication.obtainInstance()) + it.printStackTrace() }) } \ No newline at end of file