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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.obtainWorkOrderDetail(id = jobId) } }) } 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 5802b2e..df5fb0c 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 @@ -17,8 +17,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellOperationViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_well_operation.* @@ -28,9 +27,8 @@ class WellOperationActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel - private lateinit var operationViewModel: WellOperationViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var wellOperationAdapter: WellOperationAdapter @@ -54,14 +52,13 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(this) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(WellOperationViewModel::class.java) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean @@ -107,7 +104,7 @@ }) //撤防布防状态监听 - operationViewModel.resultModel.observe(this, { + wellViewModel.commonResultModel.observe(this, { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -119,7 +116,7 @@ } } }) - operationViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") @@ -245,7 +242,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - activity.operationViewModel.obtainOperationResult( + activity.wellViewModel.obtainOperationResult( id = wellId, state = bfzt ) } 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 5802b2e..df5fb0c 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 @@ -17,8 +17,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellOperationViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_well_operation.* @@ -28,9 +27,8 @@ class WellOperationActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel - private lateinit var operationViewModel: WellOperationViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var wellOperationAdapter: WellOperationAdapter @@ -54,14 +52,13 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(this) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(WellOperationViewModel::class.java) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean @@ -107,7 +104,7 @@ }) //撤防布防状态监听 - operationViewModel.resultModel.observe(this, { + wellViewModel.commonResultModel.observe(this, { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -119,7 +116,7 @@ } } }) - operationViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") @@ -245,7 +242,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - activity.operationViewModel.obtainOperationResult( + activity.wellViewModel.obtainOperationResult( id = wellId, state = bfzt ) } 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 a326a02..4871f17 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.CompletedDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_completed.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: CompletedOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.COMPLETED_ACTION, object : BroadcastReceiver() { @@ -95,7 +95,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -156,7 +156,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.obtainWorkOrderDetail(id = jobId) } }) } 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 5802b2e..df5fb0c 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 @@ -17,8 +17,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellOperationViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_well_operation.* @@ -28,9 +27,8 @@ class WellOperationActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel - private lateinit var operationViewModel: WellOperationViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var wellOperationAdapter: WellOperationAdapter @@ -54,14 +52,13 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(this) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(WellOperationViewModel::class.java) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean @@ -107,7 +104,7 @@ }) //撤防布防状态监听 - operationViewModel.resultModel.observe(this, { + wellViewModel.commonResultModel.observe(this, { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -119,7 +116,7 @@ } } }) - operationViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") @@ -245,7 +242,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - activity.operationViewModel.obtainOperationResult( + activity.wellViewModel.obtainOperationResult( id = wellId, state = bfzt ) } 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 a326a02..4871f17 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.CompletedDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_completed.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: CompletedOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.COMPLETED_ACTION, object : BroadcastReceiver() { @@ -95,7 +95,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -156,7 +156,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 1b76266..e5c910c 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 @@ -25,8 +25,8 @@ import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity import com.casic.app.smartwell.view.WellOperationActivity -import com.casic.app.smartwell.vm.WellCountViewModel import com.casic.app.smartwell.vm.WellListViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.EasyPopupWindow import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView @@ -40,7 +40,7 @@ private val kTag = "HomePageFragment" private lateinit var homeView: View - private lateinit var wellCountViewModel: WellCountViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var aMap: AMap @@ -101,7 +101,7 @@ } //初始化vm - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) @@ -151,7 +151,7 @@ initMap(savedInstanceState) //获取窨井监控数据 - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner, { homeView.unDeployedWellView.text = it["bfWell"] homeView.deployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] @@ -355,7 +355,7 @@ super.onResume() homeView.mapView.onResume() //每次页面切换都需要重新刷新不同状态的窨井数量 - wellCountViewModel.countWellByState() + wellViewModel.countWellByState() workOrderViewModel.countWorkOrderByState() } 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 5802b2e..df5fb0c 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 @@ -17,8 +17,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellOperationViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_well_operation.* @@ -28,9 +27,8 @@ class WellOperationActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel - private lateinit var operationViewModel: WellOperationViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var wellOperationAdapter: WellOperationAdapter @@ -54,14 +52,13 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(this) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(WellOperationViewModel::class.java) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean @@ -107,7 +104,7 @@ }) //撤防布防状态监听 - operationViewModel.resultModel.observe(this, { + wellViewModel.commonResultModel.observe(this, { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -119,7 +116,7 @@ } } }) - operationViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") @@ -245,7 +242,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - activity.operationViewModel.obtainOperationResult( + activity.wellViewModel.obtainOperationResult( id = wellId, state = bfzt ) } 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 a326a02..4871f17 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.CompletedDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_completed.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: CompletedOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.COMPLETED_ACTION, object : BroadcastReceiver() { @@ -95,7 +95,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -156,7 +156,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 1b76266..e5c910c 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 @@ -25,8 +25,8 @@ import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity import com.casic.app.smartwell.view.WellOperationActivity -import com.casic.app.smartwell.vm.WellCountViewModel import com.casic.app.smartwell.vm.WellListViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.EasyPopupWindow import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView @@ -40,7 +40,7 @@ private val kTag = "HomePageFragment" private lateinit var homeView: View - private lateinit var wellCountViewModel: WellCountViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var aMap: AMap @@ -101,7 +101,7 @@ } //初始化vm - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) @@ -151,7 +151,7 @@ initMap(savedInstanceState) //获取窨井监控数据 - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner, { homeView.unDeployedWellView.text = it["bfWell"] homeView.deployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] @@ -355,7 +355,7 @@ super.onResume() homeView.mapView.onResume() //每次页面切换都需要重新刷新不同状态的窨井数量 - wellCountViewModel.countWellByState() + wellViewModel.countWellByState() workOrderViewModel.countWorkOrderByState() } 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 3cdc251..0faa308 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.InHandleDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_in_handle.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: InHandleOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) /*** * 监听来自待确认和处理中两个列表数据变化的Action * */ @@ -98,7 +98,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -159,7 +159,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.obtainWorkOrderDetail(id = jobId) } }) } 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 5802b2e..df5fb0c 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 @@ -17,8 +17,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellOperationViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_well_operation.* @@ -28,9 +27,8 @@ class WellOperationActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel - private lateinit var operationViewModel: WellOperationViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var wellOperationAdapter: WellOperationAdapter @@ -54,14 +52,13 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(this) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(WellOperationViewModel::class.java) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean @@ -107,7 +104,7 @@ }) //撤防布防状态监听 - operationViewModel.resultModel.observe(this, { + wellViewModel.commonResultModel.observe(this, { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -119,7 +116,7 @@ } } }) - operationViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") @@ -245,7 +242,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - activity.operationViewModel.obtainOperationResult( + activity.wellViewModel.obtainOperationResult( id = wellId, state = bfzt ) } 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 a326a02..4871f17 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.CompletedDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_completed.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: CompletedOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.COMPLETED_ACTION, object : BroadcastReceiver() { @@ -95,7 +95,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -156,7 +156,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 1b76266..e5c910c 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 @@ -25,8 +25,8 @@ import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity import com.casic.app.smartwell.view.WellOperationActivity -import com.casic.app.smartwell.vm.WellCountViewModel import com.casic.app.smartwell.vm.WellListViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.EasyPopupWindow import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView @@ -40,7 +40,7 @@ private val kTag = "HomePageFragment" private lateinit var homeView: View - private lateinit var wellCountViewModel: WellCountViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var aMap: AMap @@ -101,7 +101,7 @@ } //初始化vm - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) @@ -151,7 +151,7 @@ initMap(savedInstanceState) //获取窨井监控数据 - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner, { homeView.unDeployedWellView.text = it["bfWell"] homeView.deployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] @@ -355,7 +355,7 @@ super.onResume() homeView.mapView.onResume() //每次页面切换都需要重新刷新不同状态的窨井数量 - wellCountViewModel.countWellByState() + wellViewModel.countWellByState() workOrderViewModel.countWorkOrderByState() } 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 3cdc251..0faa308 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.InHandleDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_in_handle.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: InHandleOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) /*** * 监听来自待确认和处理中两个列表数据变化的Action * */ @@ -98,7 +98,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -159,7 +159,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 0b8340b..c727ce2 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 @@ -17,7 +17,7 @@ import com.casic.app.smartwell.view.AboutUsActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity -import com.casic.app.smartwell.vm.UpdateVersionViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.app.multilib.base.BaseFragment @@ -31,7 +31,7 @@ private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean - private lateinit var updateVersionViewModel: UpdateVersionViewModel + private lateinit var userViewModel: UserViewModel private lateinit var progressDialog: ProgressDialog override fun initLayoutView(): Int = R.layout.fragment_mine @@ -46,7 +46,7 @@ ) userNameView.text = userDataModel.name } - updateVersionViewModel = ViewModelProvider(this).get(UpdateVersionViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -65,9 +65,9 @@ } updateVersionLayout.setOnClickListener { - updateVersionViewModel.updateVersion() + userViewModel.updateVersion() } - updateVersionViewModel.resultModel.observe(this, { + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show() } else { @@ -89,7 +89,7 @@ }).build().show() } }) - updateVersionViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "检查版本中，请稍后") 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 5802b2e..df5fb0c 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 @@ -17,8 +17,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellOperationViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_well_operation.* @@ -28,9 +27,8 @@ class WellOperationActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel - private lateinit var operationViewModel: WellOperationViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var wellOperationAdapter: WellOperationAdapter @@ -54,14 +52,13 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(this) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(WellOperationViewModel::class.java) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean @@ -107,7 +104,7 @@ }) //撤防布防状态监听 - operationViewModel.resultModel.observe(this, { + wellViewModel.commonResultModel.observe(this, { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -119,7 +116,7 @@ } } }) - operationViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") @@ -245,7 +242,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - activity.operationViewModel.obtainOperationResult( + activity.wellViewModel.obtainOperationResult( id = wellId, state = bfzt ) } 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 a326a02..4871f17 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.CompletedDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_completed.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: CompletedOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.COMPLETED_ACTION, object : BroadcastReceiver() { @@ -95,7 +95,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -156,7 +156,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 1b76266..e5c910c 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 @@ -25,8 +25,8 @@ import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity import com.casic.app.smartwell.view.WellOperationActivity -import com.casic.app.smartwell.vm.WellCountViewModel import com.casic.app.smartwell.vm.WellListViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.EasyPopupWindow import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView @@ -40,7 +40,7 @@ private val kTag = "HomePageFragment" private lateinit var homeView: View - private lateinit var wellCountViewModel: WellCountViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var aMap: AMap @@ -101,7 +101,7 @@ } //初始化vm - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) @@ -151,7 +151,7 @@ initMap(savedInstanceState) //获取窨井监控数据 - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner, { homeView.unDeployedWellView.text = it["bfWell"] homeView.deployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] @@ -355,7 +355,7 @@ super.onResume() homeView.mapView.onResume() //每次页面切换都需要重新刷新不同状态的窨井数量 - wellCountViewModel.countWellByState() + wellViewModel.countWellByState() workOrderViewModel.countWorkOrderByState() } 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 3cdc251..0faa308 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.InHandleDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_in_handle.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: InHandleOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) /*** * 监听来自待确认和处理中两个列表数据变化的Action * */ @@ -98,7 +98,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -159,7 +159,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 0b8340b..c727ce2 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 @@ -17,7 +17,7 @@ import com.casic.app.smartwell.view.AboutUsActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity -import com.casic.app.smartwell.vm.UpdateVersionViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.app.multilib.base.BaseFragment @@ -31,7 +31,7 @@ private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean - private lateinit var updateVersionViewModel: UpdateVersionViewModel + private lateinit var userViewModel: UserViewModel private lateinit var progressDialog: ProgressDialog override fun initLayoutView(): Int = R.layout.fragment_mine @@ -46,7 +46,7 @@ ) userNameView.text = userDataModel.name } - updateVersionViewModel = ViewModelProvider(this).get(UpdateVersionViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -65,9 +65,9 @@ } updateVersionLayout.setOnClickListener { - updateVersionViewModel.updateVersion() + userViewModel.updateVersion() } - updateVersionViewModel.resultModel.observe(this, { + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show() } else { @@ -89,7 +89,7 @@ }).build().show() } }) - updateVersionViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "检查版本中，请稍后") 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 4805c62..34059cf 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -35,7 +35,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -48,7 +48,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_ACCEPT_ACTION, object : BroadcastReceiver() { @@ -90,7 +90,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -181,7 +181,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 5802b2e..df5fb0c 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 @@ -17,8 +17,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellOperationViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_well_operation.* @@ -28,9 +27,8 @@ class WellOperationActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel - private lateinit var operationViewModel: WellOperationViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var wellOperationAdapter: WellOperationAdapter @@ -54,14 +52,13 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(this) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(WellOperationViewModel::class.java) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean @@ -107,7 +104,7 @@ }) //撤防布防状态监听 - operationViewModel.resultModel.observe(this, { + wellViewModel.commonResultModel.observe(this, { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -119,7 +116,7 @@ } } }) - operationViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") @@ -245,7 +242,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - activity.operationViewModel.obtainOperationResult( + activity.wellViewModel.obtainOperationResult( id = wellId, state = bfzt ) } 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 a326a02..4871f17 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.CompletedDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_completed.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: CompletedOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.COMPLETED_ACTION, object : BroadcastReceiver() { @@ -95,7 +95,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -156,7 +156,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 1b76266..e5c910c 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 @@ -25,8 +25,8 @@ import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity import com.casic.app.smartwell.view.WellOperationActivity -import com.casic.app.smartwell.vm.WellCountViewModel import com.casic.app.smartwell.vm.WellListViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.EasyPopupWindow import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView @@ -40,7 +40,7 @@ private val kTag = "HomePageFragment" private lateinit var homeView: View - private lateinit var wellCountViewModel: WellCountViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var aMap: AMap @@ -101,7 +101,7 @@ } //初始化vm - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) @@ -151,7 +151,7 @@ initMap(savedInstanceState) //获取窨井监控数据 - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner, { homeView.unDeployedWellView.text = it["bfWell"] homeView.deployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] @@ -355,7 +355,7 @@ super.onResume() homeView.mapView.onResume() //每次页面切换都需要重新刷新不同状态的窨井数量 - wellCountViewModel.countWellByState() + wellViewModel.countWellByState() workOrderViewModel.countWorkOrderByState() } 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 3cdc251..0faa308 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.InHandleDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_in_handle.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: InHandleOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) /*** * 监听来自待确认和处理中两个列表数据变化的Action * */ @@ -98,7 +98,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -159,7 +159,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 0b8340b..c727ce2 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 @@ -17,7 +17,7 @@ import com.casic.app.smartwell.view.AboutUsActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity -import com.casic.app.smartwell.vm.UpdateVersionViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.app.multilib.base.BaseFragment @@ -31,7 +31,7 @@ private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean - private lateinit var updateVersionViewModel: UpdateVersionViewModel + private lateinit var userViewModel: UserViewModel private lateinit var progressDialog: ProgressDialog override fun initLayoutView(): Int = R.layout.fragment_mine @@ -46,7 +46,7 @@ ) userNameView.text = userDataModel.name } - updateVersionViewModel = ViewModelProvider(this).get(UpdateVersionViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -65,9 +65,9 @@ } updateVersionLayout.setOnClickListener { - updateVersionViewModel.updateVersion() + userViewModel.updateVersion() } - updateVersionViewModel.resultModel.observe(this, { + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show() } else { @@ -89,7 +89,7 @@ }).build().show() } }) - updateVersionViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "检查版本中，请稍后") 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 4805c62..34059cf 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -35,7 +35,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -48,7 +48,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_ACCEPT_ACTION, object : BroadcastReceiver() { @@ -90,7 +90,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -181,7 +181,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 389e0df..e2743a5 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -32,7 +32,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -44,7 +44,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_PROCESSED_ACTION, object : BroadcastReceiver() { @@ -86,7 +86,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -174,7 +174,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 5802b2e..df5fb0c 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 @@ -17,8 +17,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellOperationViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_well_operation.* @@ -28,9 +27,8 @@ class WellOperationActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel - private lateinit var operationViewModel: WellOperationViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var wellOperationAdapter: WellOperationAdapter @@ -54,14 +52,13 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(this) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(WellOperationViewModel::class.java) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean @@ -107,7 +104,7 @@ }) //撤防布防状态监听 - operationViewModel.resultModel.observe(this, { + wellViewModel.commonResultModel.observe(this, { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -119,7 +116,7 @@ } } }) - operationViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") @@ -245,7 +242,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - activity.operationViewModel.obtainOperationResult( + activity.wellViewModel.obtainOperationResult( id = wellId, state = bfzt ) } 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 a326a02..4871f17 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.CompletedDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_completed.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: CompletedOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.COMPLETED_ACTION, object : BroadcastReceiver() { @@ -95,7 +95,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -156,7 +156,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 1b76266..e5c910c 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 @@ -25,8 +25,8 @@ import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity import com.casic.app.smartwell.view.WellOperationActivity -import com.casic.app.smartwell.vm.WellCountViewModel import com.casic.app.smartwell.vm.WellListViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.EasyPopupWindow import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView @@ -40,7 +40,7 @@ private val kTag = "HomePageFragment" private lateinit var homeView: View - private lateinit var wellCountViewModel: WellCountViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var aMap: AMap @@ -101,7 +101,7 @@ } //初始化vm - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) @@ -151,7 +151,7 @@ initMap(savedInstanceState) //获取窨井监控数据 - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner, { homeView.unDeployedWellView.text = it["bfWell"] homeView.deployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] @@ -355,7 +355,7 @@ super.onResume() homeView.mapView.onResume() //每次页面切换都需要重新刷新不同状态的窨井数量 - wellCountViewModel.countWellByState() + wellViewModel.countWellByState() workOrderViewModel.countWorkOrderByState() } 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 3cdc251..0faa308 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.InHandleDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_in_handle.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: InHandleOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) /*** * 监听来自待确认和处理中两个列表数据变化的Action * */ @@ -98,7 +98,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -159,7 +159,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 0b8340b..c727ce2 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 @@ -17,7 +17,7 @@ import com.casic.app.smartwell.view.AboutUsActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity -import com.casic.app.smartwell.vm.UpdateVersionViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.app.multilib.base.BaseFragment @@ -31,7 +31,7 @@ private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean - private lateinit var updateVersionViewModel: UpdateVersionViewModel + private lateinit var userViewModel: UserViewModel private lateinit var progressDialog: ProgressDialog override fun initLayoutView(): Int = R.layout.fragment_mine @@ -46,7 +46,7 @@ ) userNameView.text = userDataModel.name } - updateVersionViewModel = ViewModelProvider(this).get(UpdateVersionViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -65,9 +65,9 @@ } updateVersionLayout.setOnClickListener { - updateVersionViewModel.updateVersion() + userViewModel.updateVersion() } - updateVersionViewModel.resultModel.observe(this, { + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show() } else { @@ -89,7 +89,7 @@ }).build().show() } }) - updateVersionViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "检查版本中，请稍后") 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 4805c62..34059cf 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -35,7 +35,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -48,7 +48,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_ACCEPT_ACTION, object : BroadcastReceiver() { @@ -90,7 +90,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -181,7 +181,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 389e0df..e2743a5 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -32,7 +32,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -44,7 +44,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_PROCESSED_ACTION, object : BroadcastReceiver() { @@ -86,7 +86,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -174,7 +174,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 deleted file mode 100644 index 04da7f8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class AcceptOrderViewModel : BaseViewModel() { - - fun acceptWorkOrder(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.acceptWorkOrder(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "接单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 5802b2e..df5fb0c 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 @@ -17,8 +17,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellOperationViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_well_operation.* @@ -28,9 +27,8 @@ class WellOperationActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel - private lateinit var operationViewModel: WellOperationViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var wellOperationAdapter: WellOperationAdapter @@ -54,14 +52,13 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(this) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(WellOperationViewModel::class.java) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean @@ -107,7 +104,7 @@ }) //撤防布防状态监听 - operationViewModel.resultModel.observe(this, { + wellViewModel.commonResultModel.observe(this, { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -119,7 +116,7 @@ } } }) - operationViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") @@ -245,7 +242,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - activity.operationViewModel.obtainOperationResult( + activity.wellViewModel.obtainOperationResult( id = wellId, state = bfzt ) } 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 a326a02..4871f17 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.CompletedDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_completed.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: CompletedOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.COMPLETED_ACTION, object : BroadcastReceiver() { @@ -95,7 +95,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -156,7 +156,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 1b76266..e5c910c 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 @@ -25,8 +25,8 @@ import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity import com.casic.app.smartwell.view.WellOperationActivity -import com.casic.app.smartwell.vm.WellCountViewModel import com.casic.app.smartwell.vm.WellListViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.EasyPopupWindow import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView @@ -40,7 +40,7 @@ private val kTag = "HomePageFragment" private lateinit var homeView: View - private lateinit var wellCountViewModel: WellCountViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var aMap: AMap @@ -101,7 +101,7 @@ } //初始化vm - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) @@ -151,7 +151,7 @@ initMap(savedInstanceState) //获取窨井监控数据 - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner, { homeView.unDeployedWellView.text = it["bfWell"] homeView.deployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] @@ -355,7 +355,7 @@ super.onResume() homeView.mapView.onResume() //每次页面切换都需要重新刷新不同状态的窨井数量 - wellCountViewModel.countWellByState() + wellViewModel.countWellByState() workOrderViewModel.countWorkOrderByState() } 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 3cdc251..0faa308 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.InHandleDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_in_handle.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: InHandleOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) /*** * 监听来自待确认和处理中两个列表数据变化的Action * */ @@ -98,7 +98,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -159,7 +159,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 0b8340b..c727ce2 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 @@ -17,7 +17,7 @@ import com.casic.app.smartwell.view.AboutUsActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity -import com.casic.app.smartwell.vm.UpdateVersionViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.app.multilib.base.BaseFragment @@ -31,7 +31,7 @@ private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean - private lateinit var updateVersionViewModel: UpdateVersionViewModel + private lateinit var userViewModel: UserViewModel private lateinit var progressDialog: ProgressDialog override fun initLayoutView(): Int = R.layout.fragment_mine @@ -46,7 +46,7 @@ ) userNameView.text = userDataModel.name } - updateVersionViewModel = ViewModelProvider(this).get(UpdateVersionViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -65,9 +65,9 @@ } updateVersionLayout.setOnClickListener { - updateVersionViewModel.updateVersion() + userViewModel.updateVersion() } - updateVersionViewModel.resultModel.observe(this, { + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show() } else { @@ -89,7 +89,7 @@ }).build().show() } }) - updateVersionViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "检查版本中，请稍后") 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 4805c62..34059cf 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -35,7 +35,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -48,7 +48,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_ACCEPT_ACTION, object : BroadcastReceiver() { @@ -90,7 +90,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -181,7 +181,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 389e0df..e2743a5 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -32,7 +32,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -44,7 +44,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_PROCESSED_ACTION, object : BroadcastReceiver() { @@ -86,7 +86,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -174,7 +174,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 deleted file mode 100644 index 04da7f8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class AcceptOrderViewModel : BaseViewModel() { - - fun acceptWorkOrder(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.acceptWorkOrder(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "接单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 5fd0523..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ChangePasswordViewModel : BaseViewModel() { - - fun changePassword(oldPwd: String, newPwd: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "修改成功，请重新登录".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 5802b2e..df5fb0c 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 @@ -17,8 +17,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellOperationViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_well_operation.* @@ -28,9 +27,8 @@ class WellOperationActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel - private lateinit var operationViewModel: WellOperationViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var wellOperationAdapter: WellOperationAdapter @@ -54,14 +52,13 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(this) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(WellOperationViewModel::class.java) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean @@ -107,7 +104,7 @@ }) //撤防布防状态监听 - operationViewModel.resultModel.observe(this, { + wellViewModel.commonResultModel.observe(this, { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -119,7 +116,7 @@ } } }) - operationViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") @@ -245,7 +242,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - activity.operationViewModel.obtainOperationResult( + activity.wellViewModel.obtainOperationResult( id = wellId, state = bfzt ) } 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 a326a02..4871f17 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.CompletedDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_completed.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: CompletedOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.COMPLETED_ACTION, object : BroadcastReceiver() { @@ -95,7 +95,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -156,7 +156,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 1b76266..e5c910c 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 @@ -25,8 +25,8 @@ import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity import com.casic.app.smartwell.view.WellOperationActivity -import com.casic.app.smartwell.vm.WellCountViewModel import com.casic.app.smartwell.vm.WellListViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.EasyPopupWindow import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView @@ -40,7 +40,7 @@ private val kTag = "HomePageFragment" private lateinit var homeView: View - private lateinit var wellCountViewModel: WellCountViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var aMap: AMap @@ -101,7 +101,7 @@ } //初始化vm - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) @@ -151,7 +151,7 @@ initMap(savedInstanceState) //获取窨井监控数据 - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner, { homeView.unDeployedWellView.text = it["bfWell"] homeView.deployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] @@ -355,7 +355,7 @@ super.onResume() homeView.mapView.onResume() //每次页面切换都需要重新刷新不同状态的窨井数量 - wellCountViewModel.countWellByState() + wellViewModel.countWellByState() workOrderViewModel.countWorkOrderByState() } 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 3cdc251..0faa308 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.InHandleDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_in_handle.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: InHandleOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) /*** * 监听来自待确认和处理中两个列表数据变化的Action * */ @@ -98,7 +98,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -159,7 +159,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 0b8340b..c727ce2 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 @@ -17,7 +17,7 @@ import com.casic.app.smartwell.view.AboutUsActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity -import com.casic.app.smartwell.vm.UpdateVersionViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.app.multilib.base.BaseFragment @@ -31,7 +31,7 @@ private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean - private lateinit var updateVersionViewModel: UpdateVersionViewModel + private lateinit var userViewModel: UserViewModel private lateinit var progressDialog: ProgressDialog override fun initLayoutView(): Int = R.layout.fragment_mine @@ -46,7 +46,7 @@ ) userNameView.text = userDataModel.name } - updateVersionViewModel = ViewModelProvider(this).get(UpdateVersionViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -65,9 +65,9 @@ } updateVersionLayout.setOnClickListener { - updateVersionViewModel.updateVersion() + userViewModel.updateVersion() } - updateVersionViewModel.resultModel.observe(this, { + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show() } else { @@ -89,7 +89,7 @@ }).build().show() } }) - updateVersionViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "检查版本中，请稍后") 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 4805c62..34059cf 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -35,7 +35,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -48,7 +48,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_ACCEPT_ACTION, object : BroadcastReceiver() { @@ -90,7 +90,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -181,7 +181,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 389e0df..e2743a5 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -32,7 +32,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -44,7 +44,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_PROCESSED_ACTION, object : BroadcastReceiver() { @@ -86,7 +86,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -174,7 +174,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 deleted file mode 100644 index 04da7f8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class AcceptOrderViewModel : BaseViewModel() { - - fun acceptWorkOrder(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.acceptWorkOrder(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "接单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 5fd0523..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ChangePasswordViewModel : BaseViewModel() { - - fun changePassword(oldPwd: String, newPwd: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "修改成功，请重新登录".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index c41ac9f..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class CompleteOrderViewModel : BaseViewModel() { - - fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单处理成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 5802b2e..df5fb0c 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 @@ -17,8 +17,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellOperationViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_well_operation.* @@ -28,9 +27,8 @@ class WellOperationActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel - private lateinit var operationViewModel: WellOperationViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var wellOperationAdapter: WellOperationAdapter @@ -54,14 +52,13 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(this) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(WellOperationViewModel::class.java) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean @@ -107,7 +104,7 @@ }) //撤防布防状态监听 - operationViewModel.resultModel.observe(this, { + wellViewModel.commonResultModel.observe(this, { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -119,7 +116,7 @@ } } }) - operationViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") @@ -245,7 +242,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - activity.operationViewModel.obtainOperationResult( + activity.wellViewModel.obtainOperationResult( id = wellId, state = bfzt ) } 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 a326a02..4871f17 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.CompletedDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_completed.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: CompletedOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.COMPLETED_ACTION, object : BroadcastReceiver() { @@ -95,7 +95,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -156,7 +156,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 1b76266..e5c910c 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 @@ -25,8 +25,8 @@ import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity import com.casic.app.smartwell.view.WellOperationActivity -import com.casic.app.smartwell.vm.WellCountViewModel import com.casic.app.smartwell.vm.WellListViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.EasyPopupWindow import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView @@ -40,7 +40,7 @@ private val kTag = "HomePageFragment" private lateinit var homeView: View - private lateinit var wellCountViewModel: WellCountViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var aMap: AMap @@ -101,7 +101,7 @@ } //初始化vm - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) @@ -151,7 +151,7 @@ initMap(savedInstanceState) //获取窨井监控数据 - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner, { homeView.unDeployedWellView.text = it["bfWell"] homeView.deployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] @@ -355,7 +355,7 @@ super.onResume() homeView.mapView.onResume() //每次页面切换都需要重新刷新不同状态的窨井数量 - wellCountViewModel.countWellByState() + wellViewModel.countWellByState() workOrderViewModel.countWorkOrderByState() } 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 3cdc251..0faa308 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.InHandleDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_in_handle.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: InHandleOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) /*** * 监听来自待确认和处理中两个列表数据变化的Action * */ @@ -98,7 +98,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -159,7 +159,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 0b8340b..c727ce2 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 @@ -17,7 +17,7 @@ import com.casic.app.smartwell.view.AboutUsActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity -import com.casic.app.smartwell.vm.UpdateVersionViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.app.multilib.base.BaseFragment @@ -31,7 +31,7 @@ private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean - private lateinit var updateVersionViewModel: UpdateVersionViewModel + private lateinit var userViewModel: UserViewModel private lateinit var progressDialog: ProgressDialog override fun initLayoutView(): Int = R.layout.fragment_mine @@ -46,7 +46,7 @@ ) userNameView.text = userDataModel.name } - updateVersionViewModel = ViewModelProvider(this).get(UpdateVersionViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -65,9 +65,9 @@ } updateVersionLayout.setOnClickListener { - updateVersionViewModel.updateVersion() + userViewModel.updateVersion() } - updateVersionViewModel.resultModel.observe(this, { + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show() } else { @@ -89,7 +89,7 @@ }).build().show() } }) - updateVersionViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "检查版本中，请稍后") 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 4805c62..34059cf 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -35,7 +35,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -48,7 +48,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_ACCEPT_ACTION, object : BroadcastReceiver() { @@ -90,7 +90,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -181,7 +181,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 389e0df..e2743a5 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -32,7 +32,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -44,7 +44,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_PROCESSED_ACTION, object : BroadcastReceiver() { @@ -86,7 +86,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -174,7 +174,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 deleted file mode 100644 index 04da7f8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class AcceptOrderViewModel : BaseViewModel() { - - fun acceptWorkOrder(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.acceptWorkOrder(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "接单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 5fd0523..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ChangePasswordViewModel : BaseViewModel() { - - fun changePassword(oldPwd: String, newPwd: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "修改成功，请重新登录".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index c41ac9f..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class CompleteOrderViewModel : BaseViewModel() { - - fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单处理成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 031a671..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ConfirmOrderViewModel : BaseViewModel() { - - fun confirmWorkOrder( - id: String, firstState: String, - firstStatePhotos: String, needHandle: String - ) = launch({ - loadState.value = LoadState.Loading - val response = - RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单确认成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 5802b2e..df5fb0c 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 @@ -17,8 +17,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellOperationViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_well_operation.* @@ -28,9 +27,8 @@ class WellOperationActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel - private lateinit var operationViewModel: WellOperationViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var wellOperationAdapter: WellOperationAdapter @@ -54,14 +52,13 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(this) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(WellOperationViewModel::class.java) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean @@ -107,7 +104,7 @@ }) //撤防布防状态监听 - operationViewModel.resultModel.observe(this, { + wellViewModel.commonResultModel.observe(this, { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -119,7 +116,7 @@ } } }) - operationViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") @@ -245,7 +242,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - activity.operationViewModel.obtainOperationResult( + activity.wellViewModel.obtainOperationResult( id = wellId, state = bfzt ) } 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 a326a02..4871f17 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.CompletedDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_completed.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: CompletedOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.COMPLETED_ACTION, object : BroadcastReceiver() { @@ -95,7 +95,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -156,7 +156,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 1b76266..e5c910c 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 @@ -25,8 +25,8 @@ import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity import com.casic.app.smartwell.view.WellOperationActivity -import com.casic.app.smartwell.vm.WellCountViewModel import com.casic.app.smartwell.vm.WellListViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.EasyPopupWindow import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView @@ -40,7 +40,7 @@ private val kTag = "HomePageFragment" private lateinit var homeView: View - private lateinit var wellCountViewModel: WellCountViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var aMap: AMap @@ -101,7 +101,7 @@ } //初始化vm - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) @@ -151,7 +151,7 @@ initMap(savedInstanceState) //获取窨井监控数据 - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner, { homeView.unDeployedWellView.text = it["bfWell"] homeView.deployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] @@ -355,7 +355,7 @@ super.onResume() homeView.mapView.onResume() //每次页面切换都需要重新刷新不同状态的窨井数量 - wellCountViewModel.countWellByState() + wellViewModel.countWellByState() workOrderViewModel.countWorkOrderByState() } 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 3cdc251..0faa308 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.InHandleDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_in_handle.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: InHandleOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) /*** * 监听来自待确认和处理中两个列表数据变化的Action * */ @@ -98,7 +98,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -159,7 +159,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 0b8340b..c727ce2 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 @@ -17,7 +17,7 @@ import com.casic.app.smartwell.view.AboutUsActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity -import com.casic.app.smartwell.vm.UpdateVersionViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.app.multilib.base.BaseFragment @@ -31,7 +31,7 @@ private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean - private lateinit var updateVersionViewModel: UpdateVersionViewModel + private lateinit var userViewModel: UserViewModel private lateinit var progressDialog: ProgressDialog override fun initLayoutView(): Int = R.layout.fragment_mine @@ -46,7 +46,7 @@ ) userNameView.text = userDataModel.name } - updateVersionViewModel = ViewModelProvider(this).get(UpdateVersionViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -65,9 +65,9 @@ } updateVersionLayout.setOnClickListener { - updateVersionViewModel.updateVersion() + userViewModel.updateVersion() } - updateVersionViewModel.resultModel.observe(this, { + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show() } else { @@ -89,7 +89,7 @@ }).build().show() } }) - updateVersionViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "检查版本中，请稍后") 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 4805c62..34059cf 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -35,7 +35,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -48,7 +48,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_ACCEPT_ACTION, object : BroadcastReceiver() { @@ -90,7 +90,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -181,7 +181,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 389e0df..e2743a5 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -32,7 +32,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -44,7 +44,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_PROCESSED_ACTION, object : BroadcastReceiver() { @@ -86,7 +86,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -174,7 +174,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 deleted file mode 100644 index 04da7f8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class AcceptOrderViewModel : BaseViewModel() { - - fun acceptWorkOrder(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.acceptWorkOrder(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "接单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 5fd0523..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ChangePasswordViewModel : BaseViewModel() { - - fun changePassword(oldPwd: String, newPwd: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "修改成功，请重新登录".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index c41ac9f..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class CompleteOrderViewModel : BaseViewModel() { - - fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单处理成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 031a671..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ConfirmOrderViewModel : BaseViewModel() { - - fun confirmWorkOrder( - id: String, firstState: String, - firstStatePhotos: String, needHandle: String - ) = launch({ - loadState.value = LoadState.Loading - val response = - RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单确认成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt new file mode 100644 index 0000000..91e1292 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.vm + +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.extensions.toErrorMessage +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager + +/** + * 转单、接单、处理等vm + * */ +class OperationViewModel : BaseViewModel() { + + fun acceptWorkOrder(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.acceptWorkOrder(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "接单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun confirmWorkOrder( + id: String, firstState: String, + firstStatePhotos: String, needHandle: String + ) = launch({ + loadState.value = LoadState.Loading + val response = + RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单确认成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun transferWorkOrder(id: String, userId: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.transferWorkOrder(id, userId) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "转单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单处理成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) +} \ No newline at end of file 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 5802b2e..df5fb0c 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 @@ -17,8 +17,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellOperationViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_well_operation.* @@ -28,9 +27,8 @@ class WellOperationActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel - private lateinit var operationViewModel: WellOperationViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var wellOperationAdapter: WellOperationAdapter @@ -54,14 +52,13 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(this) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(WellOperationViewModel::class.java) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean @@ -107,7 +104,7 @@ }) //撤防布防状态监听 - operationViewModel.resultModel.observe(this, { + wellViewModel.commonResultModel.observe(this, { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -119,7 +116,7 @@ } } }) - operationViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") @@ -245,7 +242,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - activity.operationViewModel.obtainOperationResult( + activity.wellViewModel.obtainOperationResult( id = wellId, state = bfzt ) } 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 a326a02..4871f17 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.CompletedDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_completed.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: CompletedOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.COMPLETED_ACTION, object : BroadcastReceiver() { @@ -95,7 +95,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -156,7 +156,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 1b76266..e5c910c 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 @@ -25,8 +25,8 @@ import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity import com.casic.app.smartwell.view.WellOperationActivity -import com.casic.app.smartwell.vm.WellCountViewModel import com.casic.app.smartwell.vm.WellListViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.EasyPopupWindow import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView @@ -40,7 +40,7 @@ private val kTag = "HomePageFragment" private lateinit var homeView: View - private lateinit var wellCountViewModel: WellCountViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var aMap: AMap @@ -101,7 +101,7 @@ } //初始化vm - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) @@ -151,7 +151,7 @@ initMap(savedInstanceState) //获取窨井监控数据 - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner, { homeView.unDeployedWellView.text = it["bfWell"] homeView.deployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] @@ -355,7 +355,7 @@ super.onResume() homeView.mapView.onResume() //每次页面切换都需要重新刷新不同状态的窨井数量 - wellCountViewModel.countWellByState() + wellViewModel.countWellByState() workOrderViewModel.countWorkOrderByState() } 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 3cdc251..0faa308 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.InHandleDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_in_handle.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: InHandleOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) /*** * 监听来自待确认和处理中两个列表数据变化的Action * */ @@ -98,7 +98,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -159,7 +159,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 0b8340b..c727ce2 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 @@ -17,7 +17,7 @@ import com.casic.app.smartwell.view.AboutUsActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity -import com.casic.app.smartwell.vm.UpdateVersionViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.app.multilib.base.BaseFragment @@ -31,7 +31,7 @@ private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean - private lateinit var updateVersionViewModel: UpdateVersionViewModel + private lateinit var userViewModel: UserViewModel private lateinit var progressDialog: ProgressDialog override fun initLayoutView(): Int = R.layout.fragment_mine @@ -46,7 +46,7 @@ ) userNameView.text = userDataModel.name } - updateVersionViewModel = ViewModelProvider(this).get(UpdateVersionViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -65,9 +65,9 @@ } updateVersionLayout.setOnClickListener { - updateVersionViewModel.updateVersion() + userViewModel.updateVersion() } - updateVersionViewModel.resultModel.observe(this, { + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show() } else { @@ -89,7 +89,7 @@ }).build().show() } }) - updateVersionViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "检查版本中，请稍后") 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 4805c62..34059cf 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -35,7 +35,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -48,7 +48,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_ACCEPT_ACTION, object : BroadcastReceiver() { @@ -90,7 +90,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -181,7 +181,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 389e0df..e2743a5 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -32,7 +32,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -44,7 +44,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_PROCESSED_ACTION, object : BroadcastReceiver() { @@ -86,7 +86,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -174,7 +174,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 deleted file mode 100644 index 04da7f8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class AcceptOrderViewModel : BaseViewModel() { - - fun acceptWorkOrder(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.acceptWorkOrder(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "接单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 5fd0523..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ChangePasswordViewModel : BaseViewModel() { - - fun changePassword(oldPwd: String, newPwd: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "修改成功，请重新登录".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index c41ac9f..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class CompleteOrderViewModel : BaseViewModel() { - - fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单处理成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 031a671..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ConfirmOrderViewModel : BaseViewModel() { - - fun confirmWorkOrder( - id: String, firstState: String, - firstStatePhotos: String, needHandle: String - ) = launch({ - loadState.value = LoadState.Loading - val response = - RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单确认成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt new file mode 100644 index 0000000..91e1292 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.vm + +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.extensions.toErrorMessage +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager + +/** + * 转单、接单、处理等vm + * */ +class OperationViewModel : BaseViewModel() { + + fun acceptWorkOrder(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.acceptWorkOrder(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "接单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun confirmWorkOrder( + id: String, firstState: String, + firstStatePhotos: String, needHandle: String + ) = launch({ + loadState.value = LoadState.Loading + val response = + RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单确认成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun transferWorkOrder(id: String, userId: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.transferWorkOrder(id, userId) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "转单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单处理成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + 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 deleted file mode 100644 index 4cdfd84..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.OrderStatusModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class OrderStatusViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainOrderStatus() = launch({ - val response = RetrofitServiceManager.obtainOrderStatus() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 5802b2e..df5fb0c 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 @@ -17,8 +17,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellOperationViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_well_operation.* @@ -28,9 +27,8 @@ class WellOperationActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel - private lateinit var operationViewModel: WellOperationViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var wellOperationAdapter: WellOperationAdapter @@ -54,14 +52,13 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(this) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(WellOperationViewModel::class.java) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean @@ -107,7 +104,7 @@ }) //撤防布防状态监听 - operationViewModel.resultModel.observe(this, { + wellViewModel.commonResultModel.observe(this, { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -119,7 +116,7 @@ } } }) - operationViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") @@ -245,7 +242,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - activity.operationViewModel.obtainOperationResult( + activity.wellViewModel.obtainOperationResult( id = wellId, state = bfzt ) } 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 a326a02..4871f17 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.CompletedDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_completed.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: CompletedOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.COMPLETED_ACTION, object : BroadcastReceiver() { @@ -95,7 +95,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -156,7 +156,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 1b76266..e5c910c 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 @@ -25,8 +25,8 @@ import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity import com.casic.app.smartwell.view.WellOperationActivity -import com.casic.app.smartwell.vm.WellCountViewModel import com.casic.app.smartwell.vm.WellListViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.EasyPopupWindow import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView @@ -40,7 +40,7 @@ private val kTag = "HomePageFragment" private lateinit var homeView: View - private lateinit var wellCountViewModel: WellCountViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var aMap: AMap @@ -101,7 +101,7 @@ } //初始化vm - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) @@ -151,7 +151,7 @@ initMap(savedInstanceState) //获取窨井监控数据 - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner, { homeView.unDeployedWellView.text = it["bfWell"] homeView.deployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] @@ -355,7 +355,7 @@ super.onResume() homeView.mapView.onResume() //每次页面切换都需要重新刷新不同状态的窨井数量 - wellCountViewModel.countWellByState() + wellViewModel.countWellByState() workOrderViewModel.countWorkOrderByState() } 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 3cdc251..0faa308 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.InHandleDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_in_handle.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: InHandleOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) /*** * 监听来自待确认和处理中两个列表数据变化的Action * */ @@ -98,7 +98,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -159,7 +159,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 0b8340b..c727ce2 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 @@ -17,7 +17,7 @@ import com.casic.app.smartwell.view.AboutUsActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity -import com.casic.app.smartwell.vm.UpdateVersionViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.app.multilib.base.BaseFragment @@ -31,7 +31,7 @@ private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean - private lateinit var updateVersionViewModel: UpdateVersionViewModel + private lateinit var userViewModel: UserViewModel private lateinit var progressDialog: ProgressDialog override fun initLayoutView(): Int = R.layout.fragment_mine @@ -46,7 +46,7 @@ ) userNameView.text = userDataModel.name } - updateVersionViewModel = ViewModelProvider(this).get(UpdateVersionViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -65,9 +65,9 @@ } updateVersionLayout.setOnClickListener { - updateVersionViewModel.updateVersion() + userViewModel.updateVersion() } - updateVersionViewModel.resultModel.observe(this, { + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show() } else { @@ -89,7 +89,7 @@ }).build().show() } }) - updateVersionViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "检查版本中，请稍后") 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 4805c62..34059cf 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -35,7 +35,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -48,7 +48,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_ACCEPT_ACTION, object : BroadcastReceiver() { @@ -90,7 +90,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -181,7 +181,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 389e0df..e2743a5 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -32,7 +32,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -44,7 +44,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_PROCESSED_ACTION, object : BroadcastReceiver() { @@ -86,7 +86,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -174,7 +174,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 deleted file mode 100644 index 04da7f8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class AcceptOrderViewModel : BaseViewModel() { - - fun acceptWorkOrder(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.acceptWorkOrder(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "接单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 5fd0523..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ChangePasswordViewModel : BaseViewModel() { - - fun changePassword(oldPwd: String, newPwd: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "修改成功，请重新登录".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index c41ac9f..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class CompleteOrderViewModel : BaseViewModel() { - - fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单处理成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 031a671..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ConfirmOrderViewModel : BaseViewModel() { - - fun confirmWorkOrder( - id: String, firstState: String, - firstStatePhotos: String, needHandle: String - ) = launch({ - loadState.value = LoadState.Loading - val response = - RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单确认成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt new file mode 100644 index 0000000..91e1292 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.vm + +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.extensions.toErrorMessage +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager + +/** + * 转单、接单、处理等vm + * */ +class OperationViewModel : BaseViewModel() { + + fun acceptWorkOrder(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.acceptWorkOrder(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "接单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun confirmWorkOrder( + id: String, firstState: String, + firstStatePhotos: String, needHandle: String + ) = launch({ + loadState.value = LoadState.Loading + val response = + RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单确认成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun transferWorkOrder(id: String, userId: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.transferWorkOrder(id, userId) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "转单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单处理成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + 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 deleted file mode 100644 index 4cdfd84..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.OrderStatusModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class OrderStatusViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainOrderStatus() = launch({ - val response = RetrofitServiceManager.obtainOrderStatus() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index ef19e7a..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.SubordinateModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -/** - * 转单下一级人员 - * */ -class SubordinateViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainSubordinate(hasMine: String?, roleTips: String?) = launch({ - val response = RetrofitServiceManager.obtainSubordinate(hasMine, roleTips) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 5802b2e..df5fb0c 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 @@ -17,8 +17,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellOperationViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_well_operation.* @@ -28,9 +27,8 @@ class WellOperationActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel - private lateinit var operationViewModel: WellOperationViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var wellOperationAdapter: WellOperationAdapter @@ -54,14 +52,13 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(this) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(WellOperationViewModel::class.java) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean @@ -107,7 +104,7 @@ }) //撤防布防状态监听 - operationViewModel.resultModel.observe(this, { + wellViewModel.commonResultModel.observe(this, { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -119,7 +116,7 @@ } } }) - operationViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") @@ -245,7 +242,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - activity.operationViewModel.obtainOperationResult( + activity.wellViewModel.obtainOperationResult( id = wellId, state = bfzt ) } 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 a326a02..4871f17 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.CompletedDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_completed.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: CompletedOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.COMPLETED_ACTION, object : BroadcastReceiver() { @@ -95,7 +95,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -156,7 +156,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 1b76266..e5c910c 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 @@ -25,8 +25,8 @@ import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity import com.casic.app.smartwell.view.WellOperationActivity -import com.casic.app.smartwell.vm.WellCountViewModel import com.casic.app.smartwell.vm.WellListViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.EasyPopupWindow import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView @@ -40,7 +40,7 @@ private val kTag = "HomePageFragment" private lateinit var homeView: View - private lateinit var wellCountViewModel: WellCountViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var aMap: AMap @@ -101,7 +101,7 @@ } //初始化vm - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) @@ -151,7 +151,7 @@ initMap(savedInstanceState) //获取窨井监控数据 - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner, { homeView.unDeployedWellView.text = it["bfWell"] homeView.deployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] @@ -355,7 +355,7 @@ super.onResume() homeView.mapView.onResume() //每次页面切换都需要重新刷新不同状态的窨井数量 - wellCountViewModel.countWellByState() + wellViewModel.countWellByState() workOrderViewModel.countWorkOrderByState() } 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 3cdc251..0faa308 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.InHandleDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_in_handle.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: InHandleOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) /*** * 监听来自待确认和处理中两个列表数据变化的Action * */ @@ -98,7 +98,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -159,7 +159,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 0b8340b..c727ce2 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 @@ -17,7 +17,7 @@ import com.casic.app.smartwell.view.AboutUsActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity -import com.casic.app.smartwell.vm.UpdateVersionViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.app.multilib.base.BaseFragment @@ -31,7 +31,7 @@ private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean - private lateinit var updateVersionViewModel: UpdateVersionViewModel + private lateinit var userViewModel: UserViewModel private lateinit var progressDialog: ProgressDialog override fun initLayoutView(): Int = R.layout.fragment_mine @@ -46,7 +46,7 @@ ) userNameView.text = userDataModel.name } - updateVersionViewModel = ViewModelProvider(this).get(UpdateVersionViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -65,9 +65,9 @@ } updateVersionLayout.setOnClickListener { - updateVersionViewModel.updateVersion() + userViewModel.updateVersion() } - updateVersionViewModel.resultModel.observe(this, { + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show() } else { @@ -89,7 +89,7 @@ }).build().show() } }) - updateVersionViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "检查版本中，请稍后") 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 4805c62..34059cf 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -35,7 +35,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -48,7 +48,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_ACCEPT_ACTION, object : BroadcastReceiver() { @@ -90,7 +90,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -181,7 +181,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 389e0df..e2743a5 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -32,7 +32,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -44,7 +44,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_PROCESSED_ACTION, object : BroadcastReceiver() { @@ -86,7 +86,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -174,7 +174,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 deleted file mode 100644 index 04da7f8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class AcceptOrderViewModel : BaseViewModel() { - - fun acceptWorkOrder(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.acceptWorkOrder(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "接单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 5fd0523..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ChangePasswordViewModel : BaseViewModel() { - - fun changePassword(oldPwd: String, newPwd: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "修改成功，请重新登录".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index c41ac9f..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class CompleteOrderViewModel : BaseViewModel() { - - fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单处理成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 031a671..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ConfirmOrderViewModel : BaseViewModel() { - - fun confirmWorkOrder( - id: String, firstState: String, - firstStatePhotos: String, needHandle: String - ) = launch({ - loadState.value = LoadState.Loading - val response = - RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单确认成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt new file mode 100644 index 0000000..91e1292 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.vm + +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.extensions.toErrorMessage +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager + +/** + * 转单、接单、处理等vm + * */ +class OperationViewModel : BaseViewModel() { + + fun acceptWorkOrder(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.acceptWorkOrder(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "接单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun confirmWorkOrder( + id: String, firstState: String, + firstStatePhotos: String, needHandle: String + ) = launch({ + loadState.value = LoadState.Loading + val response = + RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单确认成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun transferWorkOrder(id: String, userId: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.transferWorkOrder(id, userId) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "转单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单处理成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + 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 deleted file mode 100644 index 4cdfd84..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.OrderStatusModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class OrderStatusViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainOrderStatus() = launch({ - val response = RetrofitServiceManager.obtainOrderStatus() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index ef19e7a..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.SubordinateModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -/** - * 转单下一级人员 - * */ -class SubordinateViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainSubordinate(hasMine: String?, roleTips: String?) = launch({ - val response = RetrofitServiceManager.obtainSubordinate(hasMine, roleTips) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index 617eb81..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class TransferOrderViewModel : BaseViewModel() { - - fun transferWorkOrder(id: String, userId: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.transferWorkOrder(id, userId) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "转单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 5802b2e..df5fb0c 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 @@ -17,8 +17,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellOperationViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_well_operation.* @@ -28,9 +27,8 @@ class WellOperationActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel - private lateinit var operationViewModel: WellOperationViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var wellOperationAdapter: WellOperationAdapter @@ -54,14 +52,13 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(this) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(WellOperationViewModel::class.java) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean @@ -107,7 +104,7 @@ }) //撤防布防状态监听 - operationViewModel.resultModel.observe(this, { + wellViewModel.commonResultModel.observe(this, { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -119,7 +116,7 @@ } } }) - operationViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") @@ -245,7 +242,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - activity.operationViewModel.obtainOperationResult( + activity.wellViewModel.obtainOperationResult( id = wellId, state = bfzt ) } 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 a326a02..4871f17 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.CompletedDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_completed.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: CompletedOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.COMPLETED_ACTION, object : BroadcastReceiver() { @@ -95,7 +95,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -156,7 +156,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 1b76266..e5c910c 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 @@ -25,8 +25,8 @@ import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity import com.casic.app.smartwell.view.WellOperationActivity -import com.casic.app.smartwell.vm.WellCountViewModel import com.casic.app.smartwell.vm.WellListViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.EasyPopupWindow import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView @@ -40,7 +40,7 @@ private val kTag = "HomePageFragment" private lateinit var homeView: View - private lateinit var wellCountViewModel: WellCountViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var aMap: AMap @@ -101,7 +101,7 @@ } //初始化vm - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) @@ -151,7 +151,7 @@ initMap(savedInstanceState) //获取窨井监控数据 - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner, { homeView.unDeployedWellView.text = it["bfWell"] homeView.deployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] @@ -355,7 +355,7 @@ super.onResume() homeView.mapView.onResume() //每次页面切换都需要重新刷新不同状态的窨井数量 - wellCountViewModel.countWellByState() + wellViewModel.countWellByState() workOrderViewModel.countWorkOrderByState() } 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 3cdc251..0faa308 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.InHandleDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_in_handle.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: InHandleOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) /*** * 监听来自待确认和处理中两个列表数据变化的Action * */ @@ -98,7 +98,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -159,7 +159,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 0b8340b..c727ce2 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 @@ -17,7 +17,7 @@ import com.casic.app.smartwell.view.AboutUsActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity -import com.casic.app.smartwell.vm.UpdateVersionViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.app.multilib.base.BaseFragment @@ -31,7 +31,7 @@ private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean - private lateinit var updateVersionViewModel: UpdateVersionViewModel + private lateinit var userViewModel: UserViewModel private lateinit var progressDialog: ProgressDialog override fun initLayoutView(): Int = R.layout.fragment_mine @@ -46,7 +46,7 @@ ) userNameView.text = userDataModel.name } - updateVersionViewModel = ViewModelProvider(this).get(UpdateVersionViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -65,9 +65,9 @@ } updateVersionLayout.setOnClickListener { - updateVersionViewModel.updateVersion() + userViewModel.updateVersion() } - updateVersionViewModel.resultModel.observe(this, { + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show() } else { @@ -89,7 +89,7 @@ }).build().show() } }) - updateVersionViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "检查版本中，请稍后") 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 4805c62..34059cf 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -35,7 +35,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -48,7 +48,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_ACCEPT_ACTION, object : BroadcastReceiver() { @@ -90,7 +90,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -181,7 +181,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 389e0df..e2743a5 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -32,7 +32,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -44,7 +44,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_PROCESSED_ACTION, object : BroadcastReceiver() { @@ -86,7 +86,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -174,7 +174,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 deleted file mode 100644 index 04da7f8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class AcceptOrderViewModel : BaseViewModel() { - - fun acceptWorkOrder(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.acceptWorkOrder(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "接单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 5fd0523..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ChangePasswordViewModel : BaseViewModel() { - - fun changePassword(oldPwd: String, newPwd: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "修改成功，请重新登录".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index c41ac9f..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class CompleteOrderViewModel : BaseViewModel() { - - fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单处理成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 031a671..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ConfirmOrderViewModel : BaseViewModel() { - - fun confirmWorkOrder( - id: String, firstState: String, - firstStatePhotos: String, needHandle: String - ) = launch({ - loadState.value = LoadState.Loading - val response = - RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单确认成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt new file mode 100644 index 0000000..91e1292 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.vm + +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.extensions.toErrorMessage +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager + +/** + * 转单、接单、处理等vm + * */ +class OperationViewModel : BaseViewModel() { + + fun acceptWorkOrder(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.acceptWorkOrder(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "接单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun confirmWorkOrder( + id: String, firstState: String, + firstStatePhotos: String, needHandle: String + ) = launch({ + loadState.value = LoadState.Loading + val response = + RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单确认成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun transferWorkOrder(id: String, userId: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.transferWorkOrder(id, userId) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "转单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单处理成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + 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 deleted file mode 100644 index 4cdfd84..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.OrderStatusModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class OrderStatusViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainOrderStatus() = launch({ - val response = RetrofitServiceManager.obtainOrderStatus() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index ef19e7a..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.SubordinateModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -/** - * 转单下一级人员 - * */ -class SubordinateViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainSubordinate(hasMine: String?, roleTips: String?) = launch({ - val response = RetrofitServiceManager.obtainSubordinate(hasMine, roleTips) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index 617eb81..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class TransferOrderViewModel : BaseViewModel() { - - fun transferWorkOrder(id: String, userId: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.transferWorkOrder(id, userId) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "转单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index dfd3660..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.VersionResultModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class UpdateVersionViewModel : BaseViewModel() { - - private val gson = Gson() - val resultModel = MutableLiveData() - - fun updateVersion() = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.updateVersion() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ).data - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 5802b2e..df5fb0c 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 @@ -17,8 +17,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellOperationViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_well_operation.* @@ -28,9 +27,8 @@ class WellOperationActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel - private lateinit var operationViewModel: WellOperationViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var wellOperationAdapter: WellOperationAdapter @@ -54,14 +52,13 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(this) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(WellOperationViewModel::class.java) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean @@ -107,7 +104,7 @@ }) //撤防布防状态监听 - operationViewModel.resultModel.observe(this, { + wellViewModel.commonResultModel.observe(this, { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -119,7 +116,7 @@ } } }) - operationViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") @@ -245,7 +242,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - activity.operationViewModel.obtainOperationResult( + activity.wellViewModel.obtainOperationResult( id = wellId, state = bfzt ) } 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 a326a02..4871f17 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.CompletedDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_completed.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: CompletedOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.COMPLETED_ACTION, object : BroadcastReceiver() { @@ -95,7 +95,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -156,7 +156,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 1b76266..e5c910c 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 @@ -25,8 +25,8 @@ import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity import com.casic.app.smartwell.view.WellOperationActivity -import com.casic.app.smartwell.vm.WellCountViewModel import com.casic.app.smartwell.vm.WellListViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.EasyPopupWindow import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView @@ -40,7 +40,7 @@ private val kTag = "HomePageFragment" private lateinit var homeView: View - private lateinit var wellCountViewModel: WellCountViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var aMap: AMap @@ -101,7 +101,7 @@ } //初始化vm - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) @@ -151,7 +151,7 @@ initMap(savedInstanceState) //获取窨井监控数据 - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner, { homeView.unDeployedWellView.text = it["bfWell"] homeView.deployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] @@ -355,7 +355,7 @@ super.onResume() homeView.mapView.onResume() //每次页面切换都需要重新刷新不同状态的窨井数量 - wellCountViewModel.countWellByState() + wellViewModel.countWellByState() workOrderViewModel.countWorkOrderByState() } 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 3cdc251..0faa308 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.InHandleDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_in_handle.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: InHandleOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) /*** * 监听来自待确认和处理中两个列表数据变化的Action * */ @@ -98,7 +98,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -159,7 +159,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 0b8340b..c727ce2 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 @@ -17,7 +17,7 @@ import com.casic.app.smartwell.view.AboutUsActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity -import com.casic.app.smartwell.vm.UpdateVersionViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.app.multilib.base.BaseFragment @@ -31,7 +31,7 @@ private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean - private lateinit var updateVersionViewModel: UpdateVersionViewModel + private lateinit var userViewModel: UserViewModel private lateinit var progressDialog: ProgressDialog override fun initLayoutView(): Int = R.layout.fragment_mine @@ -46,7 +46,7 @@ ) userNameView.text = userDataModel.name } - updateVersionViewModel = ViewModelProvider(this).get(UpdateVersionViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -65,9 +65,9 @@ } updateVersionLayout.setOnClickListener { - updateVersionViewModel.updateVersion() + userViewModel.updateVersion() } - updateVersionViewModel.resultModel.observe(this, { + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show() } else { @@ -89,7 +89,7 @@ }).build().show() } }) - updateVersionViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "检查版本中，请稍后") 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 4805c62..34059cf 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -35,7 +35,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -48,7 +48,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_ACCEPT_ACTION, object : BroadcastReceiver() { @@ -90,7 +90,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -181,7 +181,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 389e0df..e2743a5 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -32,7 +32,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -44,7 +44,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_PROCESSED_ACTION, object : BroadcastReceiver() { @@ -86,7 +86,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -174,7 +174,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 deleted file mode 100644 index 04da7f8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class AcceptOrderViewModel : BaseViewModel() { - - fun acceptWorkOrder(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.acceptWorkOrder(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "接单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 5fd0523..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ChangePasswordViewModel : BaseViewModel() { - - fun changePassword(oldPwd: String, newPwd: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "修改成功，请重新登录".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index c41ac9f..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class CompleteOrderViewModel : BaseViewModel() { - - fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单处理成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 031a671..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ConfirmOrderViewModel : BaseViewModel() { - - fun confirmWorkOrder( - id: String, firstState: String, - firstStatePhotos: String, needHandle: String - ) = launch({ - loadState.value = LoadState.Loading - val response = - RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单确认成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt new file mode 100644 index 0000000..91e1292 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.vm + +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.extensions.toErrorMessage +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager + +/** + * 转单、接单、处理等vm + * */ +class OperationViewModel : BaseViewModel() { + + fun acceptWorkOrder(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.acceptWorkOrder(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "接单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun confirmWorkOrder( + id: String, firstState: String, + firstStatePhotos: String, needHandle: String + ) = launch({ + loadState.value = LoadState.Loading + val response = + RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单确认成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun transferWorkOrder(id: String, userId: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.transferWorkOrder(id, userId) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "转单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单处理成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + 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 deleted file mode 100644 index 4cdfd84..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.OrderStatusModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class OrderStatusViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainOrderStatus() = launch({ - val response = RetrofitServiceManager.obtainOrderStatus() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index ef19e7a..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.SubordinateModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -/** - * 转单下一级人员 - * */ -class SubordinateViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainSubordinate(hasMine: String?, roleTips: String?) = launch({ - val response = RetrofitServiceManager.obtainSubordinate(hasMine, roleTips) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index 617eb81..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class TransferOrderViewModel : BaseViewModel() { - - fun transferWorkOrder(id: String, userId: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.transferWorkOrder(id, userId) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "转单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index dfd3660..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.VersionResultModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class UpdateVersionViewModel : BaseViewModel() { - - private val gson = Gson() - val resultModel = MutableLiveData() - - fun updateVersion() = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.updateVersion() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ).data - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 60c0f39..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.model.UserDetailModel -import com.casic.app.smartwell.utils.Constant -import com.casic.app.smartwell.utils.SaveKeyValues -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class UserDetailViewModel : BaseViewModel() { - - private val gson = Gson() - - //用户信息不用现取现用，布尔值标志用户token是否失效 - val flag = MutableLiveData() - - fun obtainUserDetail() = launch({ - val response = RetrofitServiceManager.obtainUserDetail() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - val userData = gson.fromJson( - response, object : TypeToken() {}.type - ).data - SaveKeyValues.putValue(Constant.USER_DETAIL_MODEL, gson.toJson(userData)) - flag.value = true - } else { - //如果此次获取不到用户信息，那么就清空之前的用户缓存，然后让用户重新登录 - SaveKeyValues.removeKey(Constant.USER_DETAIL_MODEL) - flag.value = false - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 5802b2e..df5fb0c 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 @@ -17,8 +17,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellOperationViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_well_operation.* @@ -28,9 +27,8 @@ class WellOperationActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel - private lateinit var operationViewModel: WellOperationViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var wellOperationAdapter: WellOperationAdapter @@ -54,14 +52,13 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(this) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(WellOperationViewModel::class.java) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean @@ -107,7 +104,7 @@ }) //撤防布防状态监听 - operationViewModel.resultModel.observe(this, { + wellViewModel.commonResultModel.observe(this, { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -119,7 +116,7 @@ } } }) - operationViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") @@ -245,7 +242,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - activity.operationViewModel.obtainOperationResult( + activity.wellViewModel.obtainOperationResult( id = wellId, state = bfzt ) } 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 a326a02..4871f17 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.CompletedDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_completed.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: CompletedOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.COMPLETED_ACTION, object : BroadcastReceiver() { @@ -95,7 +95,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -156,7 +156,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 1b76266..e5c910c 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 @@ -25,8 +25,8 @@ import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity import com.casic.app.smartwell.view.WellOperationActivity -import com.casic.app.smartwell.vm.WellCountViewModel import com.casic.app.smartwell.vm.WellListViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.EasyPopupWindow import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView @@ -40,7 +40,7 @@ private val kTag = "HomePageFragment" private lateinit var homeView: View - private lateinit var wellCountViewModel: WellCountViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var aMap: AMap @@ -101,7 +101,7 @@ } //初始化vm - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) @@ -151,7 +151,7 @@ initMap(savedInstanceState) //获取窨井监控数据 - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner, { homeView.unDeployedWellView.text = it["bfWell"] homeView.deployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] @@ -355,7 +355,7 @@ super.onResume() homeView.mapView.onResume() //每次页面切换都需要重新刷新不同状态的窨井数量 - wellCountViewModel.countWellByState() + wellViewModel.countWellByState() workOrderViewModel.countWorkOrderByState() } 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 3cdc251..0faa308 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.InHandleDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_in_handle.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: InHandleOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) /*** * 监听来自待确认和处理中两个列表数据变化的Action * */ @@ -98,7 +98,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -159,7 +159,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 0b8340b..c727ce2 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 @@ -17,7 +17,7 @@ import com.casic.app.smartwell.view.AboutUsActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity -import com.casic.app.smartwell.vm.UpdateVersionViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.app.multilib.base.BaseFragment @@ -31,7 +31,7 @@ private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean - private lateinit var updateVersionViewModel: UpdateVersionViewModel + private lateinit var userViewModel: UserViewModel private lateinit var progressDialog: ProgressDialog override fun initLayoutView(): Int = R.layout.fragment_mine @@ -46,7 +46,7 @@ ) userNameView.text = userDataModel.name } - updateVersionViewModel = ViewModelProvider(this).get(UpdateVersionViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -65,9 +65,9 @@ } updateVersionLayout.setOnClickListener { - updateVersionViewModel.updateVersion() + userViewModel.updateVersion() } - updateVersionViewModel.resultModel.observe(this, { + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show() } else { @@ -89,7 +89,7 @@ }).build().show() } }) - updateVersionViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "检查版本中，请稍后") 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 4805c62..34059cf 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -35,7 +35,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -48,7 +48,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_ACCEPT_ACTION, object : BroadcastReceiver() { @@ -90,7 +90,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -181,7 +181,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 389e0df..e2743a5 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -32,7 +32,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -44,7 +44,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_PROCESSED_ACTION, object : BroadcastReceiver() { @@ -86,7 +86,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -174,7 +174,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 deleted file mode 100644 index 04da7f8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class AcceptOrderViewModel : BaseViewModel() { - - fun acceptWorkOrder(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.acceptWorkOrder(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "接单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 5fd0523..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ChangePasswordViewModel : BaseViewModel() { - - fun changePassword(oldPwd: String, newPwd: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "修改成功，请重新登录".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index c41ac9f..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class CompleteOrderViewModel : BaseViewModel() { - - fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单处理成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 031a671..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ConfirmOrderViewModel : BaseViewModel() { - - fun confirmWorkOrder( - id: String, firstState: String, - firstStatePhotos: String, needHandle: String - ) = launch({ - loadState.value = LoadState.Loading - val response = - RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单确认成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt new file mode 100644 index 0000000..91e1292 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.vm + +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.extensions.toErrorMessage +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager + +/** + * 转单、接单、处理等vm + * */ +class OperationViewModel : BaseViewModel() { + + fun acceptWorkOrder(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.acceptWorkOrder(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "接单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun confirmWorkOrder( + id: String, firstState: String, + firstStatePhotos: String, needHandle: String + ) = launch({ + loadState.value = LoadState.Loading + val response = + RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单确认成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun transferWorkOrder(id: String, userId: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.transferWorkOrder(id, userId) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "转单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单处理成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + 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 deleted file mode 100644 index 4cdfd84..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.OrderStatusModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class OrderStatusViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainOrderStatus() = launch({ - val response = RetrofitServiceManager.obtainOrderStatus() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index ef19e7a..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.SubordinateModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -/** - * 转单下一级人员 - * */ -class SubordinateViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainSubordinate(hasMine: String?, roleTips: String?) = launch({ - val response = RetrofitServiceManager.obtainSubordinate(hasMine, roleTips) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index 617eb81..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class TransferOrderViewModel : BaseViewModel() { - - fun transferWorkOrder(id: String, userId: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.transferWorkOrder(id, userId) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "转单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index dfd3660..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.VersionResultModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class UpdateVersionViewModel : BaseViewModel() { - - private val gson = Gson() - val resultModel = MutableLiveData() - - fun updateVersion() = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.updateVersion() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ).data - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 60c0f39..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.model.UserDetailModel -import com.casic.app.smartwell.utils.Constant -import com.casic.app.smartwell.utils.SaveKeyValues -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class UserDetailViewModel : BaseViewModel() { - - private val gson = Gson() - - //用户信息不用现取现用，布尔值标志用户token是否失效 - val flag = MutableLiveData() - - fun obtainUserDetail() = launch({ - val response = RetrofitServiceManager.obtainUserDetail() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - val userData = gson.fromJson( - response, object : TypeToken() {}.type - ).data - SaveKeyValues.putValue(Constant.USER_DETAIL_MODEL, gson.toJson(userData)) - flag.value = true - } else { - //如果此次获取不到用户信息，那么就清空之前的用户缓存，然后让用户重新登录 - SaveKeyValues.removeKey(Constant.USER_DETAIL_MODEL) - flag.value = false - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt new file mode 100644 index 0000000..259c777 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt @@ -0,0 +1,96 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +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.extensions.toErrorMessage +import com.casic.app.smartwell.model.SubordinateModel +import com.casic.app.smartwell.model.UserDetailModel +import com.casic.app.smartwell.model.VersionResultModel +import com.casic.app.smartwell.utils.Constant +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.SaveKeyValues +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken + +class UserViewModel : BaseViewModel() { + + private val gson = Gson() + + //用户信息不用现取现用，布尔值标志用户token是否失效 + val flag = MutableLiveData() + val subordinateModel = MutableLiveData() + val versionResultModel = MutableLiveData() + + fun obtainUserDetail() = launch({ + val response = RetrofitServiceManager.obtainUserDetail() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + val userData = gson.fromJson( + response, object : TypeToken() {}.type + ).data + SaveKeyValues.putValue(Constant.USER_DETAIL_MODEL, gson.toJson(userData)) + flag.value = true + } else { + //如果此次获取不到用户信息，那么就清空之前的用户缓存，然后让用户重新登录 + SaveKeyValues.removeKey(Constant.USER_DETAIL_MODEL) + flag.value = false + } + }, { + it.printStackTrace() + }) + + /** + * 转单下一级人员 + * */ + fun obtainSubordinate(hasMine: String?, roleTips: String?) = launch({ + val response = RetrofitServiceManager.obtainSubordinate(hasMine, roleTips) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + subordinateModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show() + } + }, { + it.printStackTrace() + }) + + fun changePassword(oldPwd: String, newPwd: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "修改成功，请重新登录".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun updateVersion() = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.updateVersion() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + versionResultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ).data + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) +} \ No newline at end of file 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 5802b2e..df5fb0c 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 @@ -17,8 +17,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellOperationViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_well_operation.* @@ -28,9 +27,8 @@ class WellOperationActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel - private lateinit var operationViewModel: WellOperationViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var wellOperationAdapter: WellOperationAdapter @@ -54,14 +52,13 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(this) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(WellOperationViewModel::class.java) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean @@ -107,7 +104,7 @@ }) //撤防布防状态监听 - operationViewModel.resultModel.observe(this, { + wellViewModel.commonResultModel.observe(this, { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -119,7 +116,7 @@ } } }) - operationViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") @@ -245,7 +242,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - activity.operationViewModel.obtainOperationResult( + activity.wellViewModel.obtainOperationResult( id = wellId, state = bfzt ) } 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 a326a02..4871f17 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.CompletedDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_completed.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: CompletedOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.COMPLETED_ACTION, object : BroadcastReceiver() { @@ -95,7 +95,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -156,7 +156,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 1b76266..e5c910c 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 @@ -25,8 +25,8 @@ import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity import com.casic.app.smartwell.view.WellOperationActivity -import com.casic.app.smartwell.vm.WellCountViewModel import com.casic.app.smartwell.vm.WellListViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.EasyPopupWindow import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView @@ -40,7 +40,7 @@ private val kTag = "HomePageFragment" private lateinit var homeView: View - private lateinit var wellCountViewModel: WellCountViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var aMap: AMap @@ -101,7 +101,7 @@ } //初始化vm - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) @@ -151,7 +151,7 @@ initMap(savedInstanceState) //获取窨井监控数据 - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner, { homeView.unDeployedWellView.text = it["bfWell"] homeView.deployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] @@ -355,7 +355,7 @@ super.onResume() homeView.mapView.onResume() //每次页面切换都需要重新刷新不同状态的窨井数量 - wellCountViewModel.countWellByState() + wellViewModel.countWellByState() workOrderViewModel.countWorkOrderByState() } 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 3cdc251..0faa308 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.InHandleDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_in_handle.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: InHandleOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) /*** * 监听来自待确认和处理中两个列表数据变化的Action * */ @@ -98,7 +98,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -159,7 +159,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 0b8340b..c727ce2 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 @@ -17,7 +17,7 @@ import com.casic.app.smartwell.view.AboutUsActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity -import com.casic.app.smartwell.vm.UpdateVersionViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.app.multilib.base.BaseFragment @@ -31,7 +31,7 @@ private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean - private lateinit var updateVersionViewModel: UpdateVersionViewModel + private lateinit var userViewModel: UserViewModel private lateinit var progressDialog: ProgressDialog override fun initLayoutView(): Int = R.layout.fragment_mine @@ -46,7 +46,7 @@ ) userNameView.text = userDataModel.name } - updateVersionViewModel = ViewModelProvider(this).get(UpdateVersionViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -65,9 +65,9 @@ } updateVersionLayout.setOnClickListener { - updateVersionViewModel.updateVersion() + userViewModel.updateVersion() } - updateVersionViewModel.resultModel.observe(this, { + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show() } else { @@ -89,7 +89,7 @@ }).build().show() } }) - updateVersionViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "检查版本中，请稍后") 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 4805c62..34059cf 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -35,7 +35,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -48,7 +48,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_ACCEPT_ACTION, object : BroadcastReceiver() { @@ -90,7 +90,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -181,7 +181,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 389e0df..e2743a5 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -32,7 +32,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -44,7 +44,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_PROCESSED_ACTION, object : BroadcastReceiver() { @@ -86,7 +86,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -174,7 +174,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 deleted file mode 100644 index 04da7f8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class AcceptOrderViewModel : BaseViewModel() { - - fun acceptWorkOrder(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.acceptWorkOrder(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "接单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 5fd0523..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ChangePasswordViewModel : BaseViewModel() { - - fun changePassword(oldPwd: String, newPwd: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "修改成功，请重新登录".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index c41ac9f..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class CompleteOrderViewModel : BaseViewModel() { - - fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单处理成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 031a671..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ConfirmOrderViewModel : BaseViewModel() { - - fun confirmWorkOrder( - id: String, firstState: String, - firstStatePhotos: String, needHandle: String - ) = launch({ - loadState.value = LoadState.Loading - val response = - RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单确认成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt new file mode 100644 index 0000000..91e1292 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.vm + +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.extensions.toErrorMessage +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager + +/** + * 转单、接单、处理等vm + * */ +class OperationViewModel : BaseViewModel() { + + fun acceptWorkOrder(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.acceptWorkOrder(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "接单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun confirmWorkOrder( + id: String, firstState: String, + firstStatePhotos: String, needHandle: String + ) = launch({ + loadState.value = LoadState.Loading + val response = + RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单确认成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun transferWorkOrder(id: String, userId: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.transferWorkOrder(id, userId) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "转单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单处理成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + 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 deleted file mode 100644 index 4cdfd84..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.OrderStatusModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class OrderStatusViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainOrderStatus() = launch({ - val response = RetrofitServiceManager.obtainOrderStatus() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index ef19e7a..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.SubordinateModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -/** - * 转单下一级人员 - * */ -class SubordinateViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainSubordinate(hasMine: String?, roleTips: String?) = launch({ - val response = RetrofitServiceManager.obtainSubordinate(hasMine, roleTips) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index 617eb81..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class TransferOrderViewModel : BaseViewModel() { - - fun transferWorkOrder(id: String, userId: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.transferWorkOrder(id, userId) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "转单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index dfd3660..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.VersionResultModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class UpdateVersionViewModel : BaseViewModel() { - - private val gson = Gson() - val resultModel = MutableLiveData() - - fun updateVersion() = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.updateVersion() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ).data - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 60c0f39..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.model.UserDetailModel -import com.casic.app.smartwell.utils.Constant -import com.casic.app.smartwell.utils.SaveKeyValues -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class UserDetailViewModel : BaseViewModel() { - - private val gson = Gson() - - //用户信息不用现取现用，布尔值标志用户token是否失效 - val flag = MutableLiveData() - - fun obtainUserDetail() = launch({ - val response = RetrofitServiceManager.obtainUserDetail() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - val userData = gson.fromJson( - response, object : TypeToken() {}.type - ).data - SaveKeyValues.putValue(Constant.USER_DETAIL_MODEL, gson.toJson(userData)) - flag.value = true - } else { - //如果此次获取不到用户信息，那么就清空之前的用户缓存，然后让用户重新登录 - SaveKeyValues.removeKey(Constant.USER_DETAIL_MODEL) - flag.value = false - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt new file mode 100644 index 0000000..259c777 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt @@ -0,0 +1,96 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +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.extensions.toErrorMessage +import com.casic.app.smartwell.model.SubordinateModel +import com.casic.app.smartwell.model.UserDetailModel +import com.casic.app.smartwell.model.VersionResultModel +import com.casic.app.smartwell.utils.Constant +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.SaveKeyValues +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken + +class UserViewModel : BaseViewModel() { + + private val gson = Gson() + + //用户信息不用现取现用，布尔值标志用户token是否失效 + val flag = MutableLiveData() + val subordinateModel = MutableLiveData() + val versionResultModel = MutableLiveData() + + fun obtainUserDetail() = launch({ + val response = RetrofitServiceManager.obtainUserDetail() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + val userData = gson.fromJson( + response, object : TypeToken() {}.type + ).data + SaveKeyValues.putValue(Constant.USER_DETAIL_MODEL, gson.toJson(userData)) + flag.value = true + } else { + //如果此次获取不到用户信息，那么就清空之前的用户缓存，然后让用户重新登录 + SaveKeyValues.removeKey(Constant.USER_DETAIL_MODEL) + flag.value = false + } + }, { + it.printStackTrace() + }) + + /** + * 转单下一级人员 + * */ + fun obtainSubordinate(hasMine: String?, roleTips: String?) = launch({ + val response = RetrofitServiceManager.obtainSubordinate(hasMine, roleTips) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + subordinateModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show() + } + }, { + it.printStackTrace() + }) + + fun changePassword(oldPwd: String, newPwd: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "修改成功，请重新登录".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun updateVersion() = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.updateVersion() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + versionResultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ).data + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + 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 deleted file mode 100644 index 3e573eb..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import org.json.JSONObject - -class WellCountViewModel : BaseViewModel() { - - val resultModel = MutableLiveData>() - - fun countWellByState() = launch({ - val response = RetrofitServiceManager.countWellByState() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - val map = HashMap(3) - - val jsonObject = JSONObject(response) - val data = jsonObject.getJSONObject("data") - map["bfWell"] = data.getString("bfWell") - map["cfWell"] = data.getString("cfWell") - map["total"] = data.getString("total") - resultModel.value = map - } else { - response.toErrorMessage().show() - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 5802b2e..df5fb0c 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 @@ -17,8 +17,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellOperationViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_well_operation.* @@ -28,9 +27,8 @@ class WellOperationActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel - private lateinit var operationViewModel: WellOperationViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var wellOperationAdapter: WellOperationAdapter @@ -54,14 +52,13 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(this) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(WellOperationViewModel::class.java) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean @@ -107,7 +104,7 @@ }) //撤防布防状态监听 - operationViewModel.resultModel.observe(this, { + wellViewModel.commonResultModel.observe(this, { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -119,7 +116,7 @@ } } }) - operationViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") @@ -245,7 +242,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - activity.operationViewModel.obtainOperationResult( + activity.wellViewModel.obtainOperationResult( id = wellId, state = bfzt ) } 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 a326a02..4871f17 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.CompletedDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_completed.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: CompletedOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.COMPLETED_ACTION, object : BroadcastReceiver() { @@ -95,7 +95,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -156,7 +156,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 1b76266..e5c910c 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 @@ -25,8 +25,8 @@ import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity import com.casic.app.smartwell.view.WellOperationActivity -import com.casic.app.smartwell.vm.WellCountViewModel import com.casic.app.smartwell.vm.WellListViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.EasyPopupWindow import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView @@ -40,7 +40,7 @@ private val kTag = "HomePageFragment" private lateinit var homeView: View - private lateinit var wellCountViewModel: WellCountViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var aMap: AMap @@ -101,7 +101,7 @@ } //初始化vm - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) @@ -151,7 +151,7 @@ initMap(savedInstanceState) //获取窨井监控数据 - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner, { homeView.unDeployedWellView.text = it["bfWell"] homeView.deployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] @@ -355,7 +355,7 @@ super.onResume() homeView.mapView.onResume() //每次页面切换都需要重新刷新不同状态的窨井数量 - wellCountViewModel.countWellByState() + wellViewModel.countWellByState() workOrderViewModel.countWorkOrderByState() } 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 3cdc251..0faa308 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.InHandleDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_in_handle.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: InHandleOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) /*** * 监听来自待确认和处理中两个列表数据变化的Action * */ @@ -98,7 +98,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -159,7 +159,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 0b8340b..c727ce2 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 @@ -17,7 +17,7 @@ import com.casic.app.smartwell.view.AboutUsActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity -import com.casic.app.smartwell.vm.UpdateVersionViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.app.multilib.base.BaseFragment @@ -31,7 +31,7 @@ private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean - private lateinit var updateVersionViewModel: UpdateVersionViewModel + private lateinit var userViewModel: UserViewModel private lateinit var progressDialog: ProgressDialog override fun initLayoutView(): Int = R.layout.fragment_mine @@ -46,7 +46,7 @@ ) userNameView.text = userDataModel.name } - updateVersionViewModel = ViewModelProvider(this).get(UpdateVersionViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -65,9 +65,9 @@ } updateVersionLayout.setOnClickListener { - updateVersionViewModel.updateVersion() + userViewModel.updateVersion() } - updateVersionViewModel.resultModel.observe(this, { + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show() } else { @@ -89,7 +89,7 @@ }).build().show() } }) - updateVersionViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "检查版本中，请稍后") 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 4805c62..34059cf 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -35,7 +35,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -48,7 +48,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_ACCEPT_ACTION, object : BroadcastReceiver() { @@ -90,7 +90,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -181,7 +181,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 389e0df..e2743a5 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -32,7 +32,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -44,7 +44,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_PROCESSED_ACTION, object : BroadcastReceiver() { @@ -86,7 +86,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -174,7 +174,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 deleted file mode 100644 index 04da7f8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class AcceptOrderViewModel : BaseViewModel() { - - fun acceptWorkOrder(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.acceptWorkOrder(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "接单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 5fd0523..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ChangePasswordViewModel : BaseViewModel() { - - fun changePassword(oldPwd: String, newPwd: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "修改成功，请重新登录".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index c41ac9f..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class CompleteOrderViewModel : BaseViewModel() { - - fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单处理成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 031a671..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ConfirmOrderViewModel : BaseViewModel() { - - fun confirmWorkOrder( - id: String, firstState: String, - firstStatePhotos: String, needHandle: String - ) = launch({ - loadState.value = LoadState.Loading - val response = - RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单确认成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt new file mode 100644 index 0000000..91e1292 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.vm + +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.extensions.toErrorMessage +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager + +/** + * 转单、接单、处理等vm + * */ +class OperationViewModel : BaseViewModel() { + + fun acceptWorkOrder(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.acceptWorkOrder(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "接单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun confirmWorkOrder( + id: String, firstState: String, + firstStatePhotos: String, needHandle: String + ) = launch({ + loadState.value = LoadState.Loading + val response = + RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单确认成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun transferWorkOrder(id: String, userId: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.transferWorkOrder(id, userId) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "转单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单处理成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + 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 deleted file mode 100644 index 4cdfd84..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.OrderStatusModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class OrderStatusViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainOrderStatus() = launch({ - val response = RetrofitServiceManager.obtainOrderStatus() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index ef19e7a..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.SubordinateModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -/** - * 转单下一级人员 - * */ -class SubordinateViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainSubordinate(hasMine: String?, roleTips: String?) = launch({ - val response = RetrofitServiceManager.obtainSubordinate(hasMine, roleTips) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index 617eb81..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class TransferOrderViewModel : BaseViewModel() { - - fun transferWorkOrder(id: String, userId: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.transferWorkOrder(id, userId) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "转单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index dfd3660..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.VersionResultModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class UpdateVersionViewModel : BaseViewModel() { - - private val gson = Gson() - val resultModel = MutableLiveData() - - fun updateVersion() = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.updateVersion() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ).data - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 60c0f39..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.model.UserDetailModel -import com.casic.app.smartwell.utils.Constant -import com.casic.app.smartwell.utils.SaveKeyValues -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class UserDetailViewModel : BaseViewModel() { - - private val gson = Gson() - - //用户信息不用现取现用，布尔值标志用户token是否失效 - val flag = MutableLiveData() - - fun obtainUserDetail() = launch({ - val response = RetrofitServiceManager.obtainUserDetail() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - val userData = gson.fromJson( - response, object : TypeToken() {}.type - ).data - SaveKeyValues.putValue(Constant.USER_DETAIL_MODEL, gson.toJson(userData)) - flag.value = true - } else { - //如果此次获取不到用户信息，那么就清空之前的用户缓存，然后让用户重新登录 - SaveKeyValues.removeKey(Constant.USER_DETAIL_MODEL) - flag.value = false - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt new file mode 100644 index 0000000..259c777 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt @@ -0,0 +1,96 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +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.extensions.toErrorMessage +import com.casic.app.smartwell.model.SubordinateModel +import com.casic.app.smartwell.model.UserDetailModel +import com.casic.app.smartwell.model.VersionResultModel +import com.casic.app.smartwell.utils.Constant +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.SaveKeyValues +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken + +class UserViewModel : BaseViewModel() { + + private val gson = Gson() + + //用户信息不用现取现用，布尔值标志用户token是否失效 + val flag = MutableLiveData() + val subordinateModel = MutableLiveData() + val versionResultModel = MutableLiveData() + + fun obtainUserDetail() = launch({ + val response = RetrofitServiceManager.obtainUserDetail() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + val userData = gson.fromJson( + response, object : TypeToken() {}.type + ).data + SaveKeyValues.putValue(Constant.USER_DETAIL_MODEL, gson.toJson(userData)) + flag.value = true + } else { + //如果此次获取不到用户信息，那么就清空之前的用户缓存，然后让用户重新登录 + SaveKeyValues.removeKey(Constant.USER_DETAIL_MODEL) + flag.value = false + } + }, { + it.printStackTrace() + }) + + /** + * 转单下一级人员 + * */ + fun obtainSubordinate(hasMine: String?, roleTips: String?) = launch({ + val response = RetrofitServiceManager.obtainSubordinate(hasMine, roleTips) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + subordinateModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show() + } + }, { + it.printStackTrace() + }) + + fun changePassword(oldPwd: String, newPwd: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "修改成功，请重新登录".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun updateVersion() = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.updateVersion() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + versionResultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ).data + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + 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 deleted file mode 100644 index 3e573eb..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import org.json.JSONObject - -class WellCountViewModel : BaseViewModel() { - - val resultModel = MutableLiveData>() - - fun countWellByState() = launch({ - val response = RetrofitServiceManager.countWellByState() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - val map = HashMap(3) - - val jsonObject = JSONObject(response) - val data = jsonObject.getJSONObject("data") - map["bfWell"] = data.getString("bfWell") - map["cfWell"] = data.getString("cfWell") - map["total"] = data.getString("total") - resultModel.value = map - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index 6810546..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.WellDetailModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class WellDetailViewModel : BaseViewModel() { - - private val gson = Gson() - val detailModel = MutableLiveData() - - fun obtainWellDetail(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainWellDetail(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 5802b2e..df5fb0c 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 @@ -17,8 +17,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellOperationViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_well_operation.* @@ -28,9 +27,8 @@ class WellOperationActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel - private lateinit var operationViewModel: WellOperationViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var wellOperationAdapter: WellOperationAdapter @@ -54,14 +52,13 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(this) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(WellOperationViewModel::class.java) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean @@ -107,7 +104,7 @@ }) //撤防布防状态监听 - operationViewModel.resultModel.observe(this, { + wellViewModel.commonResultModel.observe(this, { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -119,7 +116,7 @@ } } }) - operationViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") @@ -245,7 +242,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - activity.operationViewModel.obtainOperationResult( + activity.wellViewModel.obtainOperationResult( id = wellId, state = bfzt ) } 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 a326a02..4871f17 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.CompletedDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_completed.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: CompletedOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.COMPLETED_ACTION, object : BroadcastReceiver() { @@ -95,7 +95,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -156,7 +156,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 1b76266..e5c910c 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 @@ -25,8 +25,8 @@ import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity import com.casic.app.smartwell.view.WellOperationActivity -import com.casic.app.smartwell.vm.WellCountViewModel import com.casic.app.smartwell.vm.WellListViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.EasyPopupWindow import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView @@ -40,7 +40,7 @@ private val kTag = "HomePageFragment" private lateinit var homeView: View - private lateinit var wellCountViewModel: WellCountViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var aMap: AMap @@ -101,7 +101,7 @@ } //初始化vm - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) @@ -151,7 +151,7 @@ initMap(savedInstanceState) //获取窨井监控数据 - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner, { homeView.unDeployedWellView.text = it["bfWell"] homeView.deployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] @@ -355,7 +355,7 @@ super.onResume() homeView.mapView.onResume() //每次页面切换都需要重新刷新不同状态的窨井数量 - wellCountViewModel.countWellByState() + wellViewModel.countWellByState() workOrderViewModel.countWorkOrderByState() } 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 3cdc251..0faa308 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.InHandleDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_in_handle.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: InHandleOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) /*** * 监听来自待确认和处理中两个列表数据变化的Action * */ @@ -98,7 +98,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -159,7 +159,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 0b8340b..c727ce2 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 @@ -17,7 +17,7 @@ import com.casic.app.smartwell.view.AboutUsActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity -import com.casic.app.smartwell.vm.UpdateVersionViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.app.multilib.base.BaseFragment @@ -31,7 +31,7 @@ private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean - private lateinit var updateVersionViewModel: UpdateVersionViewModel + private lateinit var userViewModel: UserViewModel private lateinit var progressDialog: ProgressDialog override fun initLayoutView(): Int = R.layout.fragment_mine @@ -46,7 +46,7 @@ ) userNameView.text = userDataModel.name } - updateVersionViewModel = ViewModelProvider(this).get(UpdateVersionViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -65,9 +65,9 @@ } updateVersionLayout.setOnClickListener { - updateVersionViewModel.updateVersion() + userViewModel.updateVersion() } - updateVersionViewModel.resultModel.observe(this, { + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show() } else { @@ -89,7 +89,7 @@ }).build().show() } }) - updateVersionViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "检查版本中，请稍后") 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 4805c62..34059cf 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -35,7 +35,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -48,7 +48,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_ACCEPT_ACTION, object : BroadcastReceiver() { @@ -90,7 +90,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -181,7 +181,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 389e0df..e2743a5 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -32,7 +32,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -44,7 +44,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_PROCESSED_ACTION, object : BroadcastReceiver() { @@ -86,7 +86,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -174,7 +174,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 deleted file mode 100644 index 04da7f8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class AcceptOrderViewModel : BaseViewModel() { - - fun acceptWorkOrder(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.acceptWorkOrder(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "接单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 5fd0523..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ChangePasswordViewModel : BaseViewModel() { - - fun changePassword(oldPwd: String, newPwd: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "修改成功，请重新登录".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index c41ac9f..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class CompleteOrderViewModel : BaseViewModel() { - - fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单处理成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 031a671..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ConfirmOrderViewModel : BaseViewModel() { - - fun confirmWorkOrder( - id: String, firstState: String, - firstStatePhotos: String, needHandle: String - ) = launch({ - loadState.value = LoadState.Loading - val response = - RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单确认成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt new file mode 100644 index 0000000..91e1292 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.vm + +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.extensions.toErrorMessage +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager + +/** + * 转单、接单、处理等vm + * */ +class OperationViewModel : BaseViewModel() { + + fun acceptWorkOrder(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.acceptWorkOrder(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "接单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun confirmWorkOrder( + id: String, firstState: String, + firstStatePhotos: String, needHandle: String + ) = launch({ + loadState.value = LoadState.Loading + val response = + RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单确认成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun transferWorkOrder(id: String, userId: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.transferWorkOrder(id, userId) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "转单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单处理成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + 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 deleted file mode 100644 index 4cdfd84..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.OrderStatusModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class OrderStatusViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainOrderStatus() = launch({ - val response = RetrofitServiceManager.obtainOrderStatus() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index ef19e7a..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.SubordinateModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -/** - * 转单下一级人员 - * */ -class SubordinateViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainSubordinate(hasMine: String?, roleTips: String?) = launch({ - val response = RetrofitServiceManager.obtainSubordinate(hasMine, roleTips) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index 617eb81..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class TransferOrderViewModel : BaseViewModel() { - - fun transferWorkOrder(id: String, userId: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.transferWorkOrder(id, userId) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "转单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index dfd3660..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.VersionResultModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class UpdateVersionViewModel : BaseViewModel() { - - private val gson = Gson() - val resultModel = MutableLiveData() - - fun updateVersion() = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.updateVersion() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ).data - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 60c0f39..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.model.UserDetailModel -import com.casic.app.smartwell.utils.Constant -import com.casic.app.smartwell.utils.SaveKeyValues -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class UserDetailViewModel : BaseViewModel() { - - private val gson = Gson() - - //用户信息不用现取现用，布尔值标志用户token是否失效 - val flag = MutableLiveData() - - fun obtainUserDetail() = launch({ - val response = RetrofitServiceManager.obtainUserDetail() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - val userData = gson.fromJson( - response, object : TypeToken() {}.type - ).data - SaveKeyValues.putValue(Constant.USER_DETAIL_MODEL, gson.toJson(userData)) - flag.value = true - } else { - //如果此次获取不到用户信息，那么就清空之前的用户缓存，然后让用户重新登录 - SaveKeyValues.removeKey(Constant.USER_DETAIL_MODEL) - flag.value = false - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt new file mode 100644 index 0000000..259c777 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt @@ -0,0 +1,96 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +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.extensions.toErrorMessage +import com.casic.app.smartwell.model.SubordinateModel +import com.casic.app.smartwell.model.UserDetailModel +import com.casic.app.smartwell.model.VersionResultModel +import com.casic.app.smartwell.utils.Constant +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.SaveKeyValues +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken + +class UserViewModel : BaseViewModel() { + + private val gson = Gson() + + //用户信息不用现取现用，布尔值标志用户token是否失效 + val flag = MutableLiveData() + val subordinateModel = MutableLiveData() + val versionResultModel = MutableLiveData() + + fun obtainUserDetail() = launch({ + val response = RetrofitServiceManager.obtainUserDetail() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + val userData = gson.fromJson( + response, object : TypeToken() {}.type + ).data + SaveKeyValues.putValue(Constant.USER_DETAIL_MODEL, gson.toJson(userData)) + flag.value = true + } else { + //如果此次获取不到用户信息，那么就清空之前的用户缓存，然后让用户重新登录 + SaveKeyValues.removeKey(Constant.USER_DETAIL_MODEL) + flag.value = false + } + }, { + it.printStackTrace() + }) + + /** + * 转单下一级人员 + * */ + fun obtainSubordinate(hasMine: String?, roleTips: String?) = launch({ + val response = RetrofitServiceManager.obtainSubordinate(hasMine, roleTips) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + subordinateModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show() + } + }, { + it.printStackTrace() + }) + + fun changePassword(oldPwd: String, newPwd: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "修改成功，请重新登录".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun updateVersion() = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.updateVersion() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + versionResultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ).data + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + 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 deleted file mode 100644 index 3e573eb..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import org.json.JSONObject - -class WellCountViewModel : BaseViewModel() { - - val resultModel = MutableLiveData>() - - fun countWellByState() = launch({ - val response = RetrofitServiceManager.countWellByState() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - val map = HashMap(3) - - val jsonObject = JSONObject(response) - val data = jsonObject.getJSONObject("data") - map["bfWell"] = data.getString("bfWell") - map["cfWell"] = data.getString("cfWell") - map["total"] = data.getString("total") - resultModel.value = map - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index 6810546..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.WellDetailModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class WellDetailViewModel : BaseViewModel() { - - private val gson = Gson() - val detailModel = MutableLiveData() - - fun obtainWellDetail(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainWellDetail(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 7e754b7..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.WellMonitorModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class WellMonitorViewModel : BaseViewModel() { - - private val gson = Gson() - val monitorModel = MutableLiveData() - - fun obtainMonitorResult(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainMonitorResult(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - monitorModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 5802b2e..df5fb0c 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 @@ -17,8 +17,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellOperationViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_well_operation.* @@ -28,9 +27,8 @@ class WellOperationActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel - private lateinit var operationViewModel: WellOperationViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var wellOperationAdapter: WellOperationAdapter @@ -54,14 +52,13 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(this) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(WellOperationViewModel::class.java) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean @@ -107,7 +104,7 @@ }) //撤防布防状态监听 - operationViewModel.resultModel.observe(this, { + wellViewModel.commonResultModel.observe(this, { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -119,7 +116,7 @@ } } }) - operationViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") @@ -245,7 +242,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - activity.operationViewModel.obtainOperationResult( + activity.wellViewModel.obtainOperationResult( id = wellId, state = bfzt ) } 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 a326a02..4871f17 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.CompletedDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_completed.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: CompletedOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.COMPLETED_ACTION, object : BroadcastReceiver() { @@ -95,7 +95,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -156,7 +156,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 1b76266..e5c910c 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 @@ -25,8 +25,8 @@ import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity import com.casic.app.smartwell.view.WellOperationActivity -import com.casic.app.smartwell.vm.WellCountViewModel import com.casic.app.smartwell.vm.WellListViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.EasyPopupWindow import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView @@ -40,7 +40,7 @@ private val kTag = "HomePageFragment" private lateinit var homeView: View - private lateinit var wellCountViewModel: WellCountViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var aMap: AMap @@ -101,7 +101,7 @@ } //初始化vm - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) @@ -151,7 +151,7 @@ initMap(savedInstanceState) //获取窨井监控数据 - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner, { homeView.unDeployedWellView.text = it["bfWell"] homeView.deployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] @@ -355,7 +355,7 @@ super.onResume() homeView.mapView.onResume() //每次页面切换都需要重新刷新不同状态的窨井数量 - wellCountViewModel.countWellByState() + wellViewModel.countWellByState() workOrderViewModel.countWorkOrderByState() } 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 3cdc251..0faa308 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.InHandleDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_in_handle.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: InHandleOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) /*** * 监听来自待确认和处理中两个列表数据变化的Action * */ @@ -98,7 +98,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -159,7 +159,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 0b8340b..c727ce2 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 @@ -17,7 +17,7 @@ import com.casic.app.smartwell.view.AboutUsActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity -import com.casic.app.smartwell.vm.UpdateVersionViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.app.multilib.base.BaseFragment @@ -31,7 +31,7 @@ private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean - private lateinit var updateVersionViewModel: UpdateVersionViewModel + private lateinit var userViewModel: UserViewModel private lateinit var progressDialog: ProgressDialog override fun initLayoutView(): Int = R.layout.fragment_mine @@ -46,7 +46,7 @@ ) userNameView.text = userDataModel.name } - updateVersionViewModel = ViewModelProvider(this).get(UpdateVersionViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -65,9 +65,9 @@ } updateVersionLayout.setOnClickListener { - updateVersionViewModel.updateVersion() + userViewModel.updateVersion() } - updateVersionViewModel.resultModel.observe(this, { + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show() } else { @@ -89,7 +89,7 @@ }).build().show() } }) - updateVersionViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "检查版本中，请稍后") 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 4805c62..34059cf 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -35,7 +35,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -48,7 +48,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_ACCEPT_ACTION, object : BroadcastReceiver() { @@ -90,7 +90,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -181,7 +181,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 389e0df..e2743a5 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -32,7 +32,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -44,7 +44,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_PROCESSED_ACTION, object : BroadcastReceiver() { @@ -86,7 +86,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -174,7 +174,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 deleted file mode 100644 index 04da7f8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class AcceptOrderViewModel : BaseViewModel() { - - fun acceptWorkOrder(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.acceptWorkOrder(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "接单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 5fd0523..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ChangePasswordViewModel : BaseViewModel() { - - fun changePassword(oldPwd: String, newPwd: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "修改成功，请重新登录".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index c41ac9f..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class CompleteOrderViewModel : BaseViewModel() { - - fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单处理成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 031a671..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ConfirmOrderViewModel : BaseViewModel() { - - fun confirmWorkOrder( - id: String, firstState: String, - firstStatePhotos: String, needHandle: String - ) = launch({ - loadState.value = LoadState.Loading - val response = - RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单确认成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt new file mode 100644 index 0000000..91e1292 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.vm + +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.extensions.toErrorMessage +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager + +/** + * 转单、接单、处理等vm + * */ +class OperationViewModel : BaseViewModel() { + + fun acceptWorkOrder(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.acceptWorkOrder(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "接单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun confirmWorkOrder( + id: String, firstState: String, + firstStatePhotos: String, needHandle: String + ) = launch({ + loadState.value = LoadState.Loading + val response = + RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单确认成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun transferWorkOrder(id: String, userId: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.transferWorkOrder(id, userId) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "转单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单处理成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + 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 deleted file mode 100644 index 4cdfd84..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.OrderStatusModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class OrderStatusViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainOrderStatus() = launch({ - val response = RetrofitServiceManager.obtainOrderStatus() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index ef19e7a..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.SubordinateModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -/** - * 转单下一级人员 - * */ -class SubordinateViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainSubordinate(hasMine: String?, roleTips: String?) = launch({ - val response = RetrofitServiceManager.obtainSubordinate(hasMine, roleTips) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index 617eb81..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class TransferOrderViewModel : BaseViewModel() { - - fun transferWorkOrder(id: String, userId: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.transferWorkOrder(id, userId) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "转单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index dfd3660..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.VersionResultModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class UpdateVersionViewModel : BaseViewModel() { - - private val gson = Gson() - val resultModel = MutableLiveData() - - fun updateVersion() = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.updateVersion() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ).data - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 60c0f39..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.model.UserDetailModel -import com.casic.app.smartwell.utils.Constant -import com.casic.app.smartwell.utils.SaveKeyValues -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class UserDetailViewModel : BaseViewModel() { - - private val gson = Gson() - - //用户信息不用现取现用，布尔值标志用户token是否失效 - val flag = MutableLiveData() - - fun obtainUserDetail() = launch({ - val response = RetrofitServiceManager.obtainUserDetail() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - val userData = gson.fromJson( - response, object : TypeToken() {}.type - ).data - SaveKeyValues.putValue(Constant.USER_DETAIL_MODEL, gson.toJson(userData)) - flag.value = true - } else { - //如果此次获取不到用户信息，那么就清空之前的用户缓存，然后让用户重新登录 - SaveKeyValues.removeKey(Constant.USER_DETAIL_MODEL) - flag.value = false - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt new file mode 100644 index 0000000..259c777 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt @@ -0,0 +1,96 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +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.extensions.toErrorMessage +import com.casic.app.smartwell.model.SubordinateModel +import com.casic.app.smartwell.model.UserDetailModel +import com.casic.app.smartwell.model.VersionResultModel +import com.casic.app.smartwell.utils.Constant +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.SaveKeyValues +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken + +class UserViewModel : BaseViewModel() { + + private val gson = Gson() + + //用户信息不用现取现用，布尔值标志用户token是否失效 + val flag = MutableLiveData() + val subordinateModel = MutableLiveData() + val versionResultModel = MutableLiveData() + + fun obtainUserDetail() = launch({ + val response = RetrofitServiceManager.obtainUserDetail() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + val userData = gson.fromJson( + response, object : TypeToken() {}.type + ).data + SaveKeyValues.putValue(Constant.USER_DETAIL_MODEL, gson.toJson(userData)) + flag.value = true + } else { + //如果此次获取不到用户信息，那么就清空之前的用户缓存，然后让用户重新登录 + SaveKeyValues.removeKey(Constant.USER_DETAIL_MODEL) + flag.value = false + } + }, { + it.printStackTrace() + }) + + /** + * 转单下一级人员 + * */ + fun obtainSubordinate(hasMine: String?, roleTips: String?) = launch({ + val response = RetrofitServiceManager.obtainSubordinate(hasMine, roleTips) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + subordinateModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show() + } + }, { + it.printStackTrace() + }) + + fun changePassword(oldPwd: String, newPwd: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "修改成功，请重新登录".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun updateVersion() = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.updateVersion() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + versionResultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ).data + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + 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 deleted file mode 100644 index 3e573eb..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import org.json.JSONObject - -class WellCountViewModel : BaseViewModel() { - - val resultModel = MutableLiveData>() - - fun countWellByState() = launch({ - val response = RetrofitServiceManager.countWellByState() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - val map = HashMap(3) - - val jsonObject = JSONObject(response) - val data = jsonObject.getJSONObject("data") - map["bfWell"] = data.getString("bfWell") - map["cfWell"] = data.getString("cfWell") - map["total"] = data.getString("total") - resultModel.value = map - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index 6810546..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.WellDetailModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class WellDetailViewModel : BaseViewModel() { - - private val gson = Gson() - val detailModel = MutableLiveData() - - fun obtainWellDetail(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainWellDetail(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 7e754b7..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.WellMonitorModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class WellMonitorViewModel : BaseViewModel() { - - private val gson = Gson() - val monitorModel = MutableLiveData() - - fun obtainMonitorResult(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainMonitorResult(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - monitorModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index cdac14c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellOperationViewModel.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.CommonResultModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class WellOperationViewModel : BaseViewModel() { - - private val gson = Gson() - val resultModel = MutableLiveData() - - fun obtainOperationResult(id: String, state: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainOperationResult(id, state) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "操作成功".show() - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 5802b2e..df5fb0c 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 @@ -17,8 +17,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellOperationViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_well_operation.* @@ -28,9 +27,8 @@ class WellOperationActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel - private lateinit var operationViewModel: WellOperationViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var wellOperationAdapter: WellOperationAdapter @@ -54,14 +52,13 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(this) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(WellOperationViewModel::class.java) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean @@ -107,7 +104,7 @@ }) //撤防布防状态监听 - operationViewModel.resultModel.observe(this, { + wellViewModel.commonResultModel.observe(this, { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -119,7 +116,7 @@ } } }) - operationViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") @@ -245,7 +242,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - activity.operationViewModel.obtainOperationResult( + activity.wellViewModel.obtainOperationResult( id = wellId, state = bfzt ) } 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 a326a02..4871f17 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.CompletedDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_completed.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: CompletedOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.COMPLETED_ACTION, object : BroadcastReceiver() { @@ -95,7 +95,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -156,7 +156,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 1b76266..e5c910c 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 @@ -25,8 +25,8 @@ import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity import com.casic.app.smartwell.view.WellOperationActivity -import com.casic.app.smartwell.vm.WellCountViewModel import com.casic.app.smartwell.vm.WellListViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.EasyPopupWindow import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView @@ -40,7 +40,7 @@ private val kTag = "HomePageFragment" private lateinit var homeView: View - private lateinit var wellCountViewModel: WellCountViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var aMap: AMap @@ -101,7 +101,7 @@ } //初始化vm - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) @@ -151,7 +151,7 @@ initMap(savedInstanceState) //获取窨井监控数据 - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner, { homeView.unDeployedWellView.text = it["bfWell"] homeView.deployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] @@ -355,7 +355,7 @@ super.onResume() homeView.mapView.onResume() //每次页面切换都需要重新刷新不同状态的窨井数量 - wellCountViewModel.countWellByState() + wellViewModel.countWellByState() workOrderViewModel.countWorkOrderByState() } 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 3cdc251..0faa308 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.InHandleDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_in_handle.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: InHandleOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) /*** * 监听来自待确认和处理中两个列表数据变化的Action * */ @@ -98,7 +98,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -159,7 +159,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 0b8340b..c727ce2 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 @@ -17,7 +17,7 @@ import com.casic.app.smartwell.view.AboutUsActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity -import com.casic.app.smartwell.vm.UpdateVersionViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.app.multilib.base.BaseFragment @@ -31,7 +31,7 @@ private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean - private lateinit var updateVersionViewModel: UpdateVersionViewModel + private lateinit var userViewModel: UserViewModel private lateinit var progressDialog: ProgressDialog override fun initLayoutView(): Int = R.layout.fragment_mine @@ -46,7 +46,7 @@ ) userNameView.text = userDataModel.name } - updateVersionViewModel = ViewModelProvider(this).get(UpdateVersionViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -65,9 +65,9 @@ } updateVersionLayout.setOnClickListener { - updateVersionViewModel.updateVersion() + userViewModel.updateVersion() } - updateVersionViewModel.resultModel.observe(this, { + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show() } else { @@ -89,7 +89,7 @@ }).build().show() } }) - updateVersionViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "检查版本中，请稍后") 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 4805c62..34059cf 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -35,7 +35,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -48,7 +48,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_ACCEPT_ACTION, object : BroadcastReceiver() { @@ -90,7 +90,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -181,7 +181,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 389e0df..e2743a5 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -32,7 +32,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -44,7 +44,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_PROCESSED_ACTION, object : BroadcastReceiver() { @@ -86,7 +86,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -174,7 +174,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 deleted file mode 100644 index 04da7f8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class AcceptOrderViewModel : BaseViewModel() { - - fun acceptWorkOrder(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.acceptWorkOrder(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "接单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 5fd0523..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ChangePasswordViewModel : BaseViewModel() { - - fun changePassword(oldPwd: String, newPwd: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "修改成功，请重新登录".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index c41ac9f..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class CompleteOrderViewModel : BaseViewModel() { - - fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单处理成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 031a671..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ConfirmOrderViewModel : BaseViewModel() { - - fun confirmWorkOrder( - id: String, firstState: String, - firstStatePhotos: String, needHandle: String - ) = launch({ - loadState.value = LoadState.Loading - val response = - RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单确认成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt new file mode 100644 index 0000000..91e1292 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.vm + +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.extensions.toErrorMessage +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager + +/** + * 转单、接单、处理等vm + * */ +class OperationViewModel : BaseViewModel() { + + fun acceptWorkOrder(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.acceptWorkOrder(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "接单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun confirmWorkOrder( + id: String, firstState: String, + firstStatePhotos: String, needHandle: String + ) = launch({ + loadState.value = LoadState.Loading + val response = + RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单确认成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun transferWorkOrder(id: String, userId: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.transferWorkOrder(id, userId) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "转单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单处理成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + 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 deleted file mode 100644 index 4cdfd84..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.OrderStatusModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class OrderStatusViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainOrderStatus() = launch({ - val response = RetrofitServiceManager.obtainOrderStatus() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index ef19e7a..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.SubordinateModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -/** - * 转单下一级人员 - * */ -class SubordinateViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainSubordinate(hasMine: String?, roleTips: String?) = launch({ - val response = RetrofitServiceManager.obtainSubordinate(hasMine, roleTips) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index 617eb81..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class TransferOrderViewModel : BaseViewModel() { - - fun transferWorkOrder(id: String, userId: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.transferWorkOrder(id, userId) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "转单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index dfd3660..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.VersionResultModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class UpdateVersionViewModel : BaseViewModel() { - - private val gson = Gson() - val resultModel = MutableLiveData() - - fun updateVersion() = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.updateVersion() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ).data - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 60c0f39..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.model.UserDetailModel -import com.casic.app.smartwell.utils.Constant -import com.casic.app.smartwell.utils.SaveKeyValues -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class UserDetailViewModel : BaseViewModel() { - - private val gson = Gson() - - //用户信息不用现取现用，布尔值标志用户token是否失效 - val flag = MutableLiveData() - - fun obtainUserDetail() = launch({ - val response = RetrofitServiceManager.obtainUserDetail() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - val userData = gson.fromJson( - response, object : TypeToken() {}.type - ).data - SaveKeyValues.putValue(Constant.USER_DETAIL_MODEL, gson.toJson(userData)) - flag.value = true - } else { - //如果此次获取不到用户信息，那么就清空之前的用户缓存，然后让用户重新登录 - SaveKeyValues.removeKey(Constant.USER_DETAIL_MODEL) - flag.value = false - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt new file mode 100644 index 0000000..259c777 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt @@ -0,0 +1,96 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +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.extensions.toErrorMessage +import com.casic.app.smartwell.model.SubordinateModel +import com.casic.app.smartwell.model.UserDetailModel +import com.casic.app.smartwell.model.VersionResultModel +import com.casic.app.smartwell.utils.Constant +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.SaveKeyValues +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken + +class UserViewModel : BaseViewModel() { + + private val gson = Gson() + + //用户信息不用现取现用，布尔值标志用户token是否失效 + val flag = MutableLiveData() + val subordinateModel = MutableLiveData() + val versionResultModel = MutableLiveData() + + fun obtainUserDetail() = launch({ + val response = RetrofitServiceManager.obtainUserDetail() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + val userData = gson.fromJson( + response, object : TypeToken() {}.type + ).data + SaveKeyValues.putValue(Constant.USER_DETAIL_MODEL, gson.toJson(userData)) + flag.value = true + } else { + //如果此次获取不到用户信息，那么就清空之前的用户缓存，然后让用户重新登录 + SaveKeyValues.removeKey(Constant.USER_DETAIL_MODEL) + flag.value = false + } + }, { + it.printStackTrace() + }) + + /** + * 转单下一级人员 + * */ + fun obtainSubordinate(hasMine: String?, roleTips: String?) = launch({ + val response = RetrofitServiceManager.obtainSubordinate(hasMine, roleTips) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + subordinateModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show() + } + }, { + it.printStackTrace() + }) + + fun changePassword(oldPwd: String, newPwd: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "修改成功，请重新登录".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun updateVersion() = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.updateVersion() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + versionResultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ).data + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + 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 deleted file mode 100644 index 3e573eb..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import org.json.JSONObject - -class WellCountViewModel : BaseViewModel() { - - val resultModel = MutableLiveData>() - - fun countWellByState() = launch({ - val response = RetrofitServiceManager.countWellByState() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - val map = HashMap(3) - - val jsonObject = JSONObject(response) - val data = jsonObject.getJSONObject("data") - map["bfWell"] = data.getString("bfWell") - map["cfWell"] = data.getString("cfWell") - map["total"] = data.getString("total") - resultModel.value = map - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index 6810546..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.WellDetailModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class WellDetailViewModel : BaseViewModel() { - - private val gson = Gson() - val detailModel = MutableLiveData() - - fun obtainWellDetail(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainWellDetail(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 7e754b7..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.WellMonitorModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class WellMonitorViewModel : BaseViewModel() { - - private val gson = Gson() - val monitorModel = MutableLiveData() - - fun obtainMonitorResult(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainMonitorResult(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - monitorModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index cdac14c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellOperationViewModel.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.CommonResultModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class WellOperationViewModel : BaseViewModel() { - - private val gson = Gson() - val resultModel = MutableLiveData() - - fun obtainOperationResult(id: String, state: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainOperationResult(id, state) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "操作成功".show() - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index c5c73e9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellTypeViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.WellTypeModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class WellTypeViewModel : BaseViewModel() { - - private val gson = Gson() - val wellTypeModel = MutableLiveData() - - fun obtainWellType() = launch({ - val response = RetrofitServiceManager.obtainWellType() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - wellTypeModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 5802b2e..df5fb0c 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 @@ -17,8 +17,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellOperationViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_well_operation.* @@ -28,9 +27,8 @@ class WellOperationActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel - private lateinit var operationViewModel: WellOperationViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var wellOperationAdapter: WellOperationAdapter @@ -54,14 +52,13 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(this) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(WellOperationViewModel::class.java) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean @@ -107,7 +104,7 @@ }) //撤防布防状态监听 - operationViewModel.resultModel.observe(this, { + wellViewModel.commonResultModel.observe(this, { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -119,7 +116,7 @@ } } }) - operationViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") @@ -245,7 +242,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - activity.operationViewModel.obtainOperationResult( + activity.wellViewModel.obtainOperationResult( id = wellId, state = bfzt ) } 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 a326a02..4871f17 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.CompletedDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_completed.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: CompletedOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.COMPLETED_ACTION, object : BroadcastReceiver() { @@ -95,7 +95,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -156,7 +156,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 1b76266..e5c910c 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 @@ -25,8 +25,8 @@ import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity import com.casic.app.smartwell.view.WellOperationActivity -import com.casic.app.smartwell.vm.WellCountViewModel import com.casic.app.smartwell.vm.WellListViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.EasyPopupWindow import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView @@ -40,7 +40,7 @@ private val kTag = "HomePageFragment" private lateinit var homeView: View - private lateinit var wellCountViewModel: WellCountViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var aMap: AMap @@ -101,7 +101,7 @@ } //初始化vm - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) @@ -151,7 +151,7 @@ initMap(savedInstanceState) //获取窨井监控数据 - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner, { homeView.unDeployedWellView.text = it["bfWell"] homeView.deployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] @@ -355,7 +355,7 @@ super.onResume() homeView.mapView.onResume() //每次页面切换都需要重新刷新不同状态的窨井数量 - wellCountViewModel.countWellByState() + wellViewModel.countWellByState() workOrderViewModel.countWorkOrderByState() } 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 3cdc251..0faa308 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.InHandleDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_in_handle.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: InHandleOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) /*** * 监听来自待确认和处理中两个列表数据变化的Action * */ @@ -98,7 +98,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -159,7 +159,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 0b8340b..c727ce2 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 @@ -17,7 +17,7 @@ import com.casic.app.smartwell.view.AboutUsActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity -import com.casic.app.smartwell.vm.UpdateVersionViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.app.multilib.base.BaseFragment @@ -31,7 +31,7 @@ private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean - private lateinit var updateVersionViewModel: UpdateVersionViewModel + private lateinit var userViewModel: UserViewModel private lateinit var progressDialog: ProgressDialog override fun initLayoutView(): Int = R.layout.fragment_mine @@ -46,7 +46,7 @@ ) userNameView.text = userDataModel.name } - updateVersionViewModel = ViewModelProvider(this).get(UpdateVersionViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -65,9 +65,9 @@ } updateVersionLayout.setOnClickListener { - updateVersionViewModel.updateVersion() + userViewModel.updateVersion() } - updateVersionViewModel.resultModel.observe(this, { + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show() } else { @@ -89,7 +89,7 @@ }).build().show() } }) - updateVersionViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "检查版本中，请稍后") 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 4805c62..34059cf 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -35,7 +35,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -48,7 +48,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_ACCEPT_ACTION, object : BroadcastReceiver() { @@ -90,7 +90,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -181,7 +181,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 389e0df..e2743a5 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -32,7 +32,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -44,7 +44,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_PROCESSED_ACTION, object : BroadcastReceiver() { @@ -86,7 +86,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -174,7 +174,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 deleted file mode 100644 index 04da7f8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class AcceptOrderViewModel : BaseViewModel() { - - fun acceptWorkOrder(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.acceptWorkOrder(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "接单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 5fd0523..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ChangePasswordViewModel : BaseViewModel() { - - fun changePassword(oldPwd: String, newPwd: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "修改成功，请重新登录".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index c41ac9f..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class CompleteOrderViewModel : BaseViewModel() { - - fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单处理成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 031a671..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ConfirmOrderViewModel : BaseViewModel() { - - fun confirmWorkOrder( - id: String, firstState: String, - firstStatePhotos: String, needHandle: String - ) = launch({ - loadState.value = LoadState.Loading - val response = - RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单确认成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt new file mode 100644 index 0000000..91e1292 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.vm + +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.extensions.toErrorMessage +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager + +/** + * 转单、接单、处理等vm + * */ +class OperationViewModel : BaseViewModel() { + + fun acceptWorkOrder(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.acceptWorkOrder(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "接单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun confirmWorkOrder( + id: String, firstState: String, + firstStatePhotos: String, needHandle: String + ) = launch({ + loadState.value = LoadState.Loading + val response = + RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单确认成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun transferWorkOrder(id: String, userId: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.transferWorkOrder(id, userId) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "转单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单处理成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + 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 deleted file mode 100644 index 4cdfd84..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.OrderStatusModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class OrderStatusViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainOrderStatus() = launch({ - val response = RetrofitServiceManager.obtainOrderStatus() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index ef19e7a..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.SubordinateModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -/** - * 转单下一级人员 - * */ -class SubordinateViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainSubordinate(hasMine: String?, roleTips: String?) = launch({ - val response = RetrofitServiceManager.obtainSubordinate(hasMine, roleTips) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index 617eb81..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class TransferOrderViewModel : BaseViewModel() { - - fun transferWorkOrder(id: String, userId: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.transferWorkOrder(id, userId) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "转单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index dfd3660..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.VersionResultModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class UpdateVersionViewModel : BaseViewModel() { - - private val gson = Gson() - val resultModel = MutableLiveData() - - fun updateVersion() = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.updateVersion() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ).data - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 60c0f39..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.model.UserDetailModel -import com.casic.app.smartwell.utils.Constant -import com.casic.app.smartwell.utils.SaveKeyValues -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class UserDetailViewModel : BaseViewModel() { - - private val gson = Gson() - - //用户信息不用现取现用，布尔值标志用户token是否失效 - val flag = MutableLiveData() - - fun obtainUserDetail() = launch({ - val response = RetrofitServiceManager.obtainUserDetail() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - val userData = gson.fromJson( - response, object : TypeToken() {}.type - ).data - SaveKeyValues.putValue(Constant.USER_DETAIL_MODEL, gson.toJson(userData)) - flag.value = true - } else { - //如果此次获取不到用户信息，那么就清空之前的用户缓存，然后让用户重新登录 - SaveKeyValues.removeKey(Constant.USER_DETAIL_MODEL) - flag.value = false - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt new file mode 100644 index 0000000..259c777 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt @@ -0,0 +1,96 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +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.extensions.toErrorMessage +import com.casic.app.smartwell.model.SubordinateModel +import com.casic.app.smartwell.model.UserDetailModel +import com.casic.app.smartwell.model.VersionResultModel +import com.casic.app.smartwell.utils.Constant +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.SaveKeyValues +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken + +class UserViewModel : BaseViewModel() { + + private val gson = Gson() + + //用户信息不用现取现用，布尔值标志用户token是否失效 + val flag = MutableLiveData() + val subordinateModel = MutableLiveData() + val versionResultModel = MutableLiveData() + + fun obtainUserDetail() = launch({ + val response = RetrofitServiceManager.obtainUserDetail() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + val userData = gson.fromJson( + response, object : TypeToken() {}.type + ).data + SaveKeyValues.putValue(Constant.USER_DETAIL_MODEL, gson.toJson(userData)) + flag.value = true + } else { + //如果此次获取不到用户信息，那么就清空之前的用户缓存，然后让用户重新登录 + SaveKeyValues.removeKey(Constant.USER_DETAIL_MODEL) + flag.value = false + } + }, { + it.printStackTrace() + }) + + /** + * 转单下一级人员 + * */ + fun obtainSubordinate(hasMine: String?, roleTips: String?) = launch({ + val response = RetrofitServiceManager.obtainSubordinate(hasMine, roleTips) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + subordinateModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show() + } + }, { + it.printStackTrace() + }) + + fun changePassword(oldPwd: String, newPwd: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "修改成功，请重新登录".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun updateVersion() = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.updateVersion() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + versionResultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ).data + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + 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 deleted file mode 100644 index 3e573eb..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import org.json.JSONObject - -class WellCountViewModel : BaseViewModel() { - - val resultModel = MutableLiveData>() - - fun countWellByState() = launch({ - val response = RetrofitServiceManager.countWellByState() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - val map = HashMap(3) - - val jsonObject = JSONObject(response) - val data = jsonObject.getJSONObject("data") - map["bfWell"] = data.getString("bfWell") - map["cfWell"] = data.getString("cfWell") - map["total"] = data.getString("total") - resultModel.value = map - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index 6810546..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.WellDetailModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class WellDetailViewModel : BaseViewModel() { - - private val gson = Gson() - val detailModel = MutableLiveData() - - fun obtainWellDetail(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainWellDetail(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 7e754b7..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.WellMonitorModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class WellMonitorViewModel : BaseViewModel() { - - private val gson = Gson() - val monitorModel = MutableLiveData() - - fun obtainMonitorResult(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainMonitorResult(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - monitorModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index cdac14c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellOperationViewModel.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.CommonResultModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class WellOperationViewModel : BaseViewModel() { - - private val gson = Gson() - val resultModel = MutableLiveData() - - fun obtainOperationResult(id: String, state: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainOperationResult(id, state) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "操作成功".show() - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index c5c73e9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellTypeViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.WellTypeModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class WellTypeViewModel : BaseViewModel() { - - private val gson = Gson() - val wellTypeModel = MutableLiveData() - - fun obtainWellType() = launch({ - val response = RetrofitServiceManager.obtainWellType() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - wellTypeModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt new file mode 100644 index 0000000..90f754a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt @@ -0,0 +1,115 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +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.extensions.toErrorMessage +import com.casic.app.smartwell.model.CommonResultModel +import com.casic.app.smartwell.model.WellDetailModel +import com.casic.app.smartwell.model.WellMonitorModel +import com.casic.app.smartwell.model.WellTypeModel +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import org.json.JSONObject + +class WellViewModel : BaseViewModel() { + + private val gson = Gson() + val countResultModel = MutableLiveData>() + val wellTypeModel = MutableLiveData() + val wellDetailModel = MutableLiveData() + val commonResultModel = MutableLiveData() + val monitorModel = MutableLiveData() + + fun countWellByState() = launch({ + val response = RetrofitServiceManager.countWellByState() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + val map = HashMap(3) + + val jsonObject = JSONObject(response) + val data = jsonObject.getJSONObject("data") + map["bfWell"] = data.getString("bfWell") + map["cfWell"] = data.getString("cfWell") + map["total"] = data.getString("total") + countResultModel.value = map + } else { + response.toErrorMessage().show() + } + }, { + it.printStackTrace() + }) + + fun obtainWellType() = launch({ + val response = RetrofitServiceManager.obtainWellType() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + wellTypeModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show() + } + }, { + it.printStackTrace() + }) + + fun obtainWellDetail(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.obtainWellDetail(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + wellDetailModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun obtainOperationResult(id: String, state: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.obtainOperationResult(id, state) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "操作成功".show() + commonResultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun obtainMonitorResult(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.obtainMonitorResult(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + monitorModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) +} \ No newline at end of file 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 5802b2e..df5fb0c 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 @@ -17,8 +17,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellOperationViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_well_operation.* @@ -28,9 +27,8 @@ class WellOperationActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel - private lateinit var operationViewModel: WellOperationViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var wellOperationAdapter: WellOperationAdapter @@ -54,14 +52,13 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(this) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(WellOperationViewModel::class.java) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean @@ -107,7 +104,7 @@ }) //撤防布防状态监听 - operationViewModel.resultModel.observe(this, { + wellViewModel.commonResultModel.observe(this, { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -119,7 +116,7 @@ } } }) - operationViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") @@ -245,7 +242,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - activity.operationViewModel.obtainOperationResult( + activity.wellViewModel.obtainOperationResult( id = wellId, state = bfzt ) } 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 a326a02..4871f17 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.CompletedDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_completed.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: CompletedOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.COMPLETED_ACTION, object : BroadcastReceiver() { @@ -95,7 +95,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -156,7 +156,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 1b76266..e5c910c 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 @@ -25,8 +25,8 @@ import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity import com.casic.app.smartwell.view.WellOperationActivity -import com.casic.app.smartwell.vm.WellCountViewModel import com.casic.app.smartwell.vm.WellListViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.EasyPopupWindow import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView @@ -40,7 +40,7 @@ private val kTag = "HomePageFragment" private lateinit var homeView: View - private lateinit var wellCountViewModel: WellCountViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var aMap: AMap @@ -101,7 +101,7 @@ } //初始化vm - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) @@ -151,7 +151,7 @@ initMap(savedInstanceState) //获取窨井监控数据 - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner, { homeView.unDeployedWellView.text = it["bfWell"] homeView.deployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] @@ -355,7 +355,7 @@ super.onResume() homeView.mapView.onResume() //每次页面切换都需要重新刷新不同状态的窨井数量 - wellCountViewModel.countWellByState() + wellViewModel.countWellByState() workOrderViewModel.countWorkOrderByState() } 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 3cdc251..0faa308 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.InHandleDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_in_handle.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: InHandleOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) /*** * 监听来自待确认和处理中两个列表数据变化的Action * */ @@ -98,7 +98,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -159,7 +159,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 0b8340b..c727ce2 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 @@ -17,7 +17,7 @@ import com.casic.app.smartwell.view.AboutUsActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity -import com.casic.app.smartwell.vm.UpdateVersionViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.app.multilib.base.BaseFragment @@ -31,7 +31,7 @@ private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean - private lateinit var updateVersionViewModel: UpdateVersionViewModel + private lateinit var userViewModel: UserViewModel private lateinit var progressDialog: ProgressDialog override fun initLayoutView(): Int = R.layout.fragment_mine @@ -46,7 +46,7 @@ ) userNameView.text = userDataModel.name } - updateVersionViewModel = ViewModelProvider(this).get(UpdateVersionViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -65,9 +65,9 @@ } updateVersionLayout.setOnClickListener { - updateVersionViewModel.updateVersion() + userViewModel.updateVersion() } - updateVersionViewModel.resultModel.observe(this, { + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show() } else { @@ -89,7 +89,7 @@ }).build().show() } }) - updateVersionViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "检查版本中，请稍后") 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 4805c62..34059cf 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -35,7 +35,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -48,7 +48,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_ACCEPT_ACTION, object : BroadcastReceiver() { @@ -90,7 +90,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -181,7 +181,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 389e0df..e2743a5 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -32,7 +32,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -44,7 +44,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_PROCESSED_ACTION, object : BroadcastReceiver() { @@ -86,7 +86,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -174,7 +174,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 deleted file mode 100644 index 04da7f8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class AcceptOrderViewModel : BaseViewModel() { - - fun acceptWorkOrder(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.acceptWorkOrder(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "接单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 5fd0523..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ChangePasswordViewModel : BaseViewModel() { - - fun changePassword(oldPwd: String, newPwd: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "修改成功，请重新登录".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index c41ac9f..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class CompleteOrderViewModel : BaseViewModel() { - - fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单处理成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 031a671..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ConfirmOrderViewModel : BaseViewModel() { - - fun confirmWorkOrder( - id: String, firstState: String, - firstStatePhotos: String, needHandle: String - ) = launch({ - loadState.value = LoadState.Loading - val response = - RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单确认成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt new file mode 100644 index 0000000..91e1292 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.vm + +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.extensions.toErrorMessage +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager + +/** + * 转单、接单、处理等vm + * */ +class OperationViewModel : BaseViewModel() { + + fun acceptWorkOrder(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.acceptWorkOrder(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "接单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun confirmWorkOrder( + id: String, firstState: String, + firstStatePhotos: String, needHandle: String + ) = launch({ + loadState.value = LoadState.Loading + val response = + RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单确认成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun transferWorkOrder(id: String, userId: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.transferWorkOrder(id, userId) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "转单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单处理成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + 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 deleted file mode 100644 index 4cdfd84..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.OrderStatusModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class OrderStatusViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainOrderStatus() = launch({ - val response = RetrofitServiceManager.obtainOrderStatus() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index ef19e7a..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.SubordinateModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -/** - * 转单下一级人员 - * */ -class SubordinateViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainSubordinate(hasMine: String?, roleTips: String?) = launch({ - val response = RetrofitServiceManager.obtainSubordinate(hasMine, roleTips) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index 617eb81..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class TransferOrderViewModel : BaseViewModel() { - - fun transferWorkOrder(id: String, userId: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.transferWorkOrder(id, userId) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "转单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index dfd3660..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.VersionResultModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class UpdateVersionViewModel : BaseViewModel() { - - private val gson = Gson() - val resultModel = MutableLiveData() - - fun updateVersion() = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.updateVersion() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ).data - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 60c0f39..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.model.UserDetailModel -import com.casic.app.smartwell.utils.Constant -import com.casic.app.smartwell.utils.SaveKeyValues -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class UserDetailViewModel : BaseViewModel() { - - private val gson = Gson() - - //用户信息不用现取现用，布尔值标志用户token是否失效 - val flag = MutableLiveData() - - fun obtainUserDetail() = launch({ - val response = RetrofitServiceManager.obtainUserDetail() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - val userData = gson.fromJson( - response, object : TypeToken() {}.type - ).data - SaveKeyValues.putValue(Constant.USER_DETAIL_MODEL, gson.toJson(userData)) - flag.value = true - } else { - //如果此次获取不到用户信息，那么就清空之前的用户缓存，然后让用户重新登录 - SaveKeyValues.removeKey(Constant.USER_DETAIL_MODEL) - flag.value = false - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt new file mode 100644 index 0000000..259c777 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt @@ -0,0 +1,96 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +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.extensions.toErrorMessage +import com.casic.app.smartwell.model.SubordinateModel +import com.casic.app.smartwell.model.UserDetailModel +import com.casic.app.smartwell.model.VersionResultModel +import com.casic.app.smartwell.utils.Constant +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.SaveKeyValues +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken + +class UserViewModel : BaseViewModel() { + + private val gson = Gson() + + //用户信息不用现取现用，布尔值标志用户token是否失效 + val flag = MutableLiveData() + val subordinateModel = MutableLiveData() + val versionResultModel = MutableLiveData() + + fun obtainUserDetail() = launch({ + val response = RetrofitServiceManager.obtainUserDetail() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + val userData = gson.fromJson( + response, object : TypeToken() {}.type + ).data + SaveKeyValues.putValue(Constant.USER_DETAIL_MODEL, gson.toJson(userData)) + flag.value = true + } else { + //如果此次获取不到用户信息，那么就清空之前的用户缓存，然后让用户重新登录 + SaveKeyValues.removeKey(Constant.USER_DETAIL_MODEL) + flag.value = false + } + }, { + it.printStackTrace() + }) + + /** + * 转单下一级人员 + * */ + fun obtainSubordinate(hasMine: String?, roleTips: String?) = launch({ + val response = RetrofitServiceManager.obtainSubordinate(hasMine, roleTips) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + subordinateModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show() + } + }, { + it.printStackTrace() + }) + + fun changePassword(oldPwd: String, newPwd: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "修改成功，请重新登录".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun updateVersion() = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.updateVersion() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + versionResultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ).data + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + 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 deleted file mode 100644 index 3e573eb..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import org.json.JSONObject - -class WellCountViewModel : BaseViewModel() { - - val resultModel = MutableLiveData>() - - fun countWellByState() = launch({ - val response = RetrofitServiceManager.countWellByState() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - val map = HashMap(3) - - val jsonObject = JSONObject(response) - val data = jsonObject.getJSONObject("data") - map["bfWell"] = data.getString("bfWell") - map["cfWell"] = data.getString("cfWell") - map["total"] = data.getString("total") - resultModel.value = map - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index 6810546..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.WellDetailModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class WellDetailViewModel : BaseViewModel() { - - private val gson = Gson() - val detailModel = MutableLiveData() - - fun obtainWellDetail(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainWellDetail(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 7e754b7..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.WellMonitorModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class WellMonitorViewModel : BaseViewModel() { - - private val gson = Gson() - val monitorModel = MutableLiveData() - - fun obtainMonitorResult(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainMonitorResult(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - monitorModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index cdac14c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellOperationViewModel.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.CommonResultModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class WellOperationViewModel : BaseViewModel() { - - private val gson = Gson() - val resultModel = MutableLiveData() - - fun obtainOperationResult(id: String, state: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainOperationResult(id, state) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "操作成功".show() - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index c5c73e9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellTypeViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.WellTypeModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class WellTypeViewModel : BaseViewModel() { - - private val gson = Gson() - val wellTypeModel = MutableLiveData() - - fun obtainWellType() = launch({ - val response = RetrofitServiceManager.obtainWellType() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - wellTypeModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt new file mode 100644 index 0000000..90f754a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt @@ -0,0 +1,115 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +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.extensions.toErrorMessage +import com.casic.app.smartwell.model.CommonResultModel +import com.casic.app.smartwell.model.WellDetailModel +import com.casic.app.smartwell.model.WellMonitorModel +import com.casic.app.smartwell.model.WellTypeModel +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import org.json.JSONObject + +class WellViewModel : BaseViewModel() { + + private val gson = Gson() + val countResultModel = MutableLiveData>() + val wellTypeModel = MutableLiveData() + val wellDetailModel = MutableLiveData() + val commonResultModel = MutableLiveData() + val monitorModel = MutableLiveData() + + fun countWellByState() = launch({ + val response = RetrofitServiceManager.countWellByState() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + val map = HashMap(3) + + val jsonObject = JSONObject(response) + val data = jsonObject.getJSONObject("data") + map["bfWell"] = data.getString("bfWell") + map["cfWell"] = data.getString("cfWell") + map["total"] = data.getString("total") + countResultModel.value = map + } else { + response.toErrorMessage().show() + } + }, { + it.printStackTrace() + }) + + fun obtainWellType() = launch({ + val response = RetrofitServiceManager.obtainWellType() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + wellTypeModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show() + } + }, { + it.printStackTrace() + }) + + fun obtainWellDetail(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.obtainWellDetail(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + wellDetailModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun obtainOperationResult(id: String, state: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.obtainOperationResult(id, state) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "操作成功".show() + commonResultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun obtainMonitorResult(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.obtainMonitorResult(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + monitorModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + 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 deleted file mode 100644 index b3f139c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderDetailViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.WorkOrderDetailModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class WorkOrderDetailViewModel : BaseViewModel() { - - private val gson = Gson() - val detailModel = MutableLiveData() - - fun obtainWorkOrderDetail(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainWorkOrderDetail(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file 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 b35f73c..06cdee6 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 @@ -8,14 +8,14 @@ import com.casic.app.smartwell.extensions.navigatePageTo import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.ChangePasswordViewModel +import com.casic.app.smartwell.vm.UserViewModel import kotlinx.android.synthetic.main.activity_change_pwd.* import kotlinx.android.synthetic.main.include_base_title.* import java.nio.charset.StandardCharsets class ChangePasswordActivity : BaseActivity() { - private lateinit var changePasswordViewModel: ChangePasswordViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_change_pwd @@ -26,7 +26,7 @@ } override fun initData() { - changePasswordViewModel = ViewModelProvider(this).get(ChangePasswordViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -73,9 +73,9 @@ newPassword.toByteArray(StandardCharsets.UTF_8), publicKey ) - changePasswordViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) + userViewModel.changePassword(oldPwd = oldPassKey, newPwd = newPassKey) } - changePasswordViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "修改中，请稍后") 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 58b6171..38fd548 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_completed_detail.* import kotlinx.android.synthetic.main.include_base_order_detail.* @@ -19,7 +19,7 @@ class CompletedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var jobId: String private val context: Context = this@CompletedDetailActivity @@ -34,12 +34,12 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -126,7 +126,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 3f6e21d..c8a7a32 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 @@ -32,11 +32,10 @@ class InHandleDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var completeOrderViewModel: CompleteOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private val context: Context = this@InHandleDetailActivity @@ -57,11 +56,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - completeOrderViewModel = ViewModelProvider(this).get(CompleteOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -87,8 +85,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -191,9 +189,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -220,7 +218,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -265,7 +263,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - completeOrderViewModel.completeWorkOrder( + operationViewModel.completeWorkOrder( id = orderId, handleMessage = state, handlePhotos = imagePaths.reformat() @@ -281,7 +279,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -330,7 +328,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -352,7 +350,7 @@ }) //处理完成工单状态处理 - completeOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 dd49e70..ae2d5ad 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 @@ -14,7 +14,7 @@ import com.casic.app.smartwell.utils.* import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.qmuiteam.qmui.util.QMUIStatusBarHelper import kotlinx.android.synthetic.main.activity_login.* @@ -22,7 +22,7 @@ private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel private val textWatcher = object : TextWatcher { override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) { @@ -55,7 +55,7 @@ userPasswordView.setText(SaveKeyValues.getValue(Constant.PASSWORD, "") as String) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 - userDetailViewModel.obtainUserDetail() + userViewModel.obtainUserDetail() //验证成功登录 this.navigatePageTo() finish() 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 2c2139c..2ae670f 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 @@ -32,11 +32,10 @@ class NotConfirmedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var subordinateViewModel: SubordinateViewModel - private lateinit var transferOrderViewModel: TransferOrderViewModel - private lateinit var confirmOrderViewModel: ConfirmOrderViewModel + private lateinit var userViewModel: UserViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var jobId: String private lateinit var needHandle: String @@ -59,11 +58,10 @@ addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - subordinateViewModel = ViewModelProvider(this).get(SubordinateViewModel::class.java) - transferOrderViewModel = ViewModelProvider(this).get(TransferOrderViewModel::class.java) - confirmOrderViewModel = ViewModelProvider(this).get(ConfirmOrderViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) } override fun initEvent() { @@ -89,8 +87,8 @@ } }) - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -144,9 +142,9 @@ //转单 transferOrderButton.setChangeAlphaWhenPress(true) transferOrderButton.setOnClickListener { - subordinateViewModel.obtainSubordinate("0", "leader,member") + userViewModel.obtainSubordinate("0", "leader,member") } - subordinateViewModel.listModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this, { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -173,7 +171,7 @@ "工单ID异常，无法转单".show() return } - transferOrderViewModel.transferWorkOrder( + operationViewModel.transferWorkOrder( id = orderId, userId = personBean.id!! ) } @@ -230,7 +228,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - confirmOrderViewModel.confirmWorkOrder( + operationViewModel.confirmWorkOrder( id = orderId, firstState = state, firstStatePhotos = imagePaths.reformat(), @@ -247,7 +245,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -296,7 +294,7 @@ }) //转单状态处理 - transferOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "转单中，请稍后") @@ -318,7 +316,7 @@ }) //确认工单状态处理 - confirmOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") 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 ce92dc7..89589d2 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 @@ -1,6 +1,5 @@ package com.casic.app.smartwell.view -import android.content.Context import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -15,9 +14,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel -import com.casic.app.smartwell.vm.WellDetailViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.WellViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_order_not_processed_detail.* @@ -26,11 +25,10 @@ class NotProcessedDetailActivity : BaseActivity() { - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel - private lateinit var wellDetailViewModel: WellDetailViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel + private lateinit var wellViewModel: WellViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var jobId: String - private val context: Context = this@NotProcessedDetailActivity override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -42,14 +40,14 @@ override fun initData() { jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.obtainWorkOrderDetail(id = jobId) + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -99,7 +97,7 @@ "工单ID异常，无法接单".show() return } - acceptOrderViewModel.acceptWorkOrder(id = orderDetail.jobId!!) + operationViewModel.acceptWorkOrder(id = orderDetail.jobId!!) } override fun onCancelClick() { @@ -116,9 +114,9 @@ "窨井ID异常，无法导航".show() return@setOnClickListener } - wellDetailViewModel.obtainWellDetail(id = wellId) + wellViewModel.obtainWellDetail(id = wellId) } - wellDetailViewModel.detailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this, { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -138,7 +136,7 @@ }) //数据加载状态处理 - workOrderDetailViewModel.loadState.observe(this, { + workOrderViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") @@ -150,7 +148,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") 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 50e07e4..e04333f 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 @@ -17,9 +17,9 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* @@ -30,8 +30,8 @@ class SearchResultActivity : BaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var searchOrderViewModel: SearchOrderViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var operationViewModel: OperationViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var args: ArrayList private lateinit var searchResultAdapter: SearchResultAdapter private var dataBeans: MutableList = ArrayList() @@ -51,8 +51,8 @@ args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(this) searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -105,7 +105,7 @@ } //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "接单中，请稍后") @@ -121,7 +121,7 @@ } }) - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -207,7 +207,7 @@ "工单ID异常，无法接单".show() return } - activity.acceptOrderViewModel.acceptWorkOrder(id = jobId) + activity.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { @@ -222,7 +222,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - activity.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + activity.workOrderViewModel.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 49078f9..1759c5e 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 @@ -11,7 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.vm.AlarmContentTypeViewModel -import com.casic.app.smartwell.vm.OrderStatusViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.jzxiang.pickerview.TimePickerDialog import com.jzxiang.pickerview.data.Type import com.zhy.view.flowlayout.FlowLayout @@ -23,7 +23,7 @@ class SearchWorkOrderActivity : BaseActivity() { private lateinit var contentTypeViewModel: AlarmContentTypeViewModel - private lateinit var orderStatusViewModel: OrderStatusViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter @@ -46,7 +46,7 @@ //告警内容 contentTypeViewModel = ViewModelProvider(this).get(AlarmContentTypeViewModel::class.java) //工单状态 - orderStatusViewModel = ViewModelProvider(this).get(OrderStatusViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) } override fun initEvent() { @@ -113,8 +113,8 @@ true } - orderStatusViewModel.obtainOrderStatus() - orderStatusViewModel.listModel.observe(this, { + workOrderViewModel.obtainOrderStatus() + workOrderViewModel.orderStatusModel.observe(this, { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index e4e571c..b28a3a9 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -5,11 +5,11 @@ import com.casic.app.smartwell.R import com.casic.app.smartwell.base.BaseActivity import com.casic.app.smartwell.extensions.navigatePageTo -import com.casic.app.smartwell.vm.UserDetailViewModel +import com.casic.app.smartwell.vm.UserViewModel class SplashScreenActivity : BaseActivity() { - private lateinit var userDetailViewModel: UserDetailViewModel + private lateinit var userViewModel: UserViewModel override fun initLayoutView(): Int = R.layout.activity_splash @@ -18,7 +18,7 @@ } override fun initData() { - userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } override fun initEvent() { @@ -27,8 +27,8 @@ private val countDownTimer = object : CountDownTimer(1000, 500) { override fun onFinish() { - userDetailViewModel.obtainUserDetail() - userDetailViewModel.flag.observe(this@SplashScreenActivity, { + userViewModel.obtainUserDetail() + userViewModel.flag.observe(this@SplashScreenActivity, { if (it) { navigatePageTo() } else { 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 1b7a2db..b17e188 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 @@ -16,7 +16,7 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellDetailViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.pengxh.app.multilib.widget.dialog.AlertMessageDialog import kotlinx.android.synthetic.main.activity_well_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -24,7 +24,7 @@ class WellDetailActivity : BaseActivity() { - private lateinit var wellDetailViewModel: WellDetailViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String private val context: Context = this@WellDetailActivity @@ -38,7 +38,7 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellDetailViewModel = ViewModelProvider(this).get(WellDetailViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) //监控内容 monitorLayout.setOnClickListener { @@ -47,8 +47,8 @@ } override fun initEvent() { - wellDetailViewModel.obtainWellDetail(id = wellId) - wellDetailViewModel.detailModel.observe(this, { + wellViewModel.obtainWellDetail(id = wellId) + wellViewModel.wellDetailModel.observe(this, { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -122,7 +122,7 @@ } } }) - wellDetailViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 81fc8dd..34fb56e 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 @@ -15,7 +15,7 @@ import com.casic.app.smartwell.model.WellListModel import com.casic.app.smartwell.model.WellTypeModel import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import kotlinx.android.synthetic.main.activity_well_management.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -25,7 +25,7 @@ class WellManagementActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -48,14 +48,14 @@ override fun initData() { easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(this) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index 2137a40..07bfd13 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -10,14 +10,14 @@ import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.vm.WellMonitorViewModel +import com.casic.app.smartwell.vm.WellViewModel import kotlinx.android.synthetic.main.activity_well_monitor.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* class WellMonitorActivity : BaseActivity() { - private lateinit var wellMonitorViewModel: WellMonitorViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellId: String override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -30,16 +30,16 @@ override fun initData() { wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellMonitorViewModel = ViewModelProvider(this).get(WellMonitorViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) } override fun initEvent() { - wellMonitorViewModel.obtainMonitorResult(id = wellId) - wellMonitorViewModel.monitorModel.observe(this, { + wellViewModel.obtainMonitorResult(id = wellId) + wellViewModel.monitorModel.observe(this, { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉，该井下无设备，或设备已离线") { - wellMonitorViewModel.obtainMonitorResult(id = wellId) + wellViewModel.obtainMonitorResult(id = wellId) } } else { emptyView!!.hide() @@ -49,7 +49,7 @@ } } }) - wellMonitorViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") 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 5802b2e..df5fb0c 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 @@ -17,8 +17,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.vm.WellListViewModel -import com.casic.app.smartwell.vm.WellOperationViewModel -import com.casic.app.smartwell.vm.WellTypeViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.widgets.WellTypePopupWindow import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_well_operation.* @@ -28,9 +27,8 @@ class WellOperationActivity : BaseActivity() { - private lateinit var wellTypeViewModel: WellTypeViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var wellListViewModel: WellListViewModel - private lateinit var operationViewModel: WellOperationViewModel private lateinit var easyPopupWindow: WellTypePopupWindow private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var wellOperationAdapter: WellOperationAdapter @@ -54,14 +52,13 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(this) - wellTypeViewModel = ViewModelProvider(this).get(WellTypeViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(WellOperationViewModel::class.java) } override fun initEvent() { - wellTypeViewModel.obtainWellType() - wellTypeViewModel.wellTypeModel.observe(this, { + wellViewModel.obtainWellType() + wellViewModel.wellTypeModel.observe(this, { if (it.code == 200) { it.data!!.forEachIndexed { index, dataBean -> val bean: WellTypeModel.DataBean @@ -107,7 +104,7 @@ }) //撤防布防状态监听 - operationViewModel.resultModel.observe(this, { + wellViewModel.commonResultModel.observe(this, { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -119,7 +116,7 @@ } } }) - operationViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(this, "处理中，请稍后") @@ -245,7 +242,7 @@ .setOnDialogButtonClickListener(object : AlertControlDialog.OnDialogButtonClickListener { override fun onConfirmClick() { - activity.operationViewModel.obtainOperationResult( + activity.wellViewModel.obtainOperationResult( id = wellId, state = bfzt ) } 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 a326a02..4871f17 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.CompletedDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_completed.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var completedAdapter: CompletedOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.COMPLETED_ACTION, object : BroadcastReceiver() { @@ -95,7 +95,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -156,7 +156,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 1b76266..e5c910c 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 @@ -25,8 +25,8 @@ import com.casic.app.smartwell.view.OvertimeOrderActivity import com.casic.app.smartwell.view.WellManagementActivity import com.casic.app.smartwell.view.WellOperationActivity -import com.casic.app.smartwell.vm.WellCountViewModel import com.casic.app.smartwell.vm.WellListViewModel +import com.casic.app.smartwell.vm.WellViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.EasyPopupWindow import com.casic.app.smartwell.widgets.GaoDeClusterMarkerView @@ -40,7 +40,7 @@ private val kTag = "HomePageFragment" private lateinit var homeView: View - private lateinit var wellCountViewModel: WellCountViewModel + private lateinit var wellViewModel: WellViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var wellListViewModel: WellListViewModel private lateinit var aMap: AMap @@ -101,7 +101,7 @@ } //初始化vm - wellCountViewModel = ViewModelProvider(this).get(WellCountViewModel::class.java) + wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) @@ -151,7 +151,7 @@ initMap(savedInstanceState) //获取窨井监控数据 - wellCountViewModel.resultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner, { homeView.unDeployedWellView.text = it["bfWell"] homeView.deployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] @@ -355,7 +355,7 @@ super.onResume() homeView.mapView.onResume() //每次页面切换都需要重新刷新不同状态的窨井数量 - wellCountViewModel.countWellByState() + wellViewModel.countWellByState() workOrderViewModel.countWorkOrderByState() } 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 3cdc251..0faa308 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 @@ -18,8 +18,8 @@ import com.casic.app.smartwell.utils.BroadcastReceiverManager import com.casic.app.smartwell.utils.Constant import com.casic.app.smartwell.view.InHandleDetailActivity -import com.casic.app.smartwell.vm.WorkOrderDetailViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.base.BaseFragment import kotlinx.android.synthetic.main.fragment_order_in_handle.* @@ -30,7 +30,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var workOrderDetailViewModel: WorkOrderDetailViewModel + private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inHandleAdapter: InHandleOrderAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -42,7 +42,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderDetailViewModel = ViewModelProvider(this).get(WorkOrderDetailViewModel::class.java) + workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) /*** * 监听来自待确认和处理中两个列表数据变化的Action * */ @@ -98,7 +98,7 @@ obtainWorkOrderList(pageIndex) } - workOrderDetailViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -159,7 +159,7 @@ "工单编号异常，无法查看工单流转记录".show() return } - fragment.workOrderDetailViewModel.obtainWorkOrderDetail(id = jobId) + fragment.workOrderViewModel.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 0b8340b..c727ce2 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 @@ -17,7 +17,7 @@ import com.casic.app.smartwell.view.AboutUsActivity import com.casic.app.smartwell.view.HelpCenterActivity import com.casic.app.smartwell.view.UserDetailActivity -import com.casic.app.smartwell.vm.UpdateVersionViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.app.multilib.base.BaseFragment @@ -31,7 +31,7 @@ private val gson = Gson() private lateinit var userDataModel: UserDetailModel.DataBean - private lateinit var updateVersionViewModel: UpdateVersionViewModel + private lateinit var userViewModel: UserViewModel private lateinit var progressDialog: ProgressDialog override fun initLayoutView(): Int = R.layout.fragment_mine @@ -46,7 +46,7 @@ ) userNameView.text = userDataModel.name } - updateVersionViewModel = ViewModelProvider(this).get(UpdateVersionViewModel::class.java) + userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -65,9 +65,9 @@ } updateVersionLayout.setOnClickListener { - updateVersionViewModel.updateVersion() + userViewModel.updateVersion() } - updateVersionViewModel.resultModel.observe(this, { + userViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show() } else { @@ -89,7 +89,7 @@ }).build().show() } }) - updateVersionViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "检查版本中，请稍后") 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 4805c62..34059cf 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -35,7 +35,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -48,7 +48,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_ACCEPT_ACTION, object : BroadcastReceiver() { @@ -90,7 +90,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -181,7 +181,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 389e0df..e2743a5 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 @@ -20,7 +20,7 @@ import com.casic.app.smartwell.utils.DialogHelper import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.view.NotProcessedDetailActivity -import com.casic.app.smartwell.vm.AcceptOrderViewModel +import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.WorkOrderListViewModel import com.pengxh.app.multilib.base.BaseFragment import com.pengxh.app.multilib.widget.dialog.AlertControlDialog @@ -32,7 +32,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var workOrderListViewModel: WorkOrderListViewModel - private lateinit var acceptOrderViewModel: AcceptOrderViewModel + private lateinit var operationViewModel: OperationViewModel private lateinit var workOrderListAdapter: NotProcessedListAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 @@ -44,7 +44,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(this) workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - acceptOrderViewModel = ViewModelProvider(this).get(AcceptOrderViewModel::class.java) + operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) //注册广播接收者 BroadcastReceiverManager.instance.addAction(Constant.NOT_PROCESSED_ACTION, object : BroadcastReceiver() { @@ -86,7 +86,7 @@ }) //接单状态处理 - acceptOrderViewModel.loadState.observe(this, { + operationViewModel.loadState.observe(this, { when (it) { is LoadState.Loading -> { DialogHelper.showLoadingDialog(requireActivity(), "接单中，请稍后") @@ -174,7 +174,7 @@ "工单ID异常，无法接单".show() return } - fragment.acceptOrderViewModel.acceptWorkOrder(id = jobId) + fragment.operationViewModel.acceptWorkOrder(id = jobId) } override fun onCancelClick() { 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 deleted file mode 100644 index 04da7f8..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/AcceptOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class AcceptOrderViewModel : BaseViewModel() { - - fun acceptWorkOrder(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.acceptWorkOrder(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "接单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 5fd0523..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ChangePasswordViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ChangePasswordViewModel : BaseViewModel() { - - fun changePassword(oldPwd: String, newPwd: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "修改成功，请重新登录".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index c41ac9f..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/CompleteOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class CompleteOrderViewModel : BaseViewModel() { - - fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单处理成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 031a671..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/ConfirmOrderViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class ConfirmOrderViewModel : BaseViewModel() { - - fun confirmWorkOrder( - id: String, firstState: String, - firstStatePhotos: String, needHandle: String - ) = launch({ - loadState.value = LoadState.Loading - val response = - RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "工单确认成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt new file mode 100644 index 0000000..91e1292 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt @@ -0,0 +1,83 @@ +package com.casic.app.smartwell.vm + +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.extensions.toErrorMessage +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager + +/** + * 转单、接单、处理等vm + * */ +class OperationViewModel : BaseViewModel() { + + fun acceptWorkOrder(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.acceptWorkOrder(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "接单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun confirmWorkOrder( + id: String, firstState: String, + firstStatePhotos: String, needHandle: String + ) = launch({ + loadState.value = LoadState.Loading + val response = + RetrofitServiceManager.confirmWorkOrder(id, firstState, firstStatePhotos, needHandle) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单确认成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun transferWorkOrder(id: String, userId: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.transferWorkOrder(id, userId) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "转单成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.completeWorkOrder(id, handleMessage, handlePhotos) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "工单处理成功".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + 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 deleted file mode 100644 index 4cdfd84..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/OrderStatusViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.OrderStatusModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class OrderStatusViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainOrderStatus() = launch({ - val response = RetrofitServiceManager.obtainOrderStatus() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index ef19e7a..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/SubordinateViewModel.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.SubordinateModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -/** - * 转单下一级人员 - * */ -class SubordinateViewModel : BaseViewModel() { - - private val gson = Gson() - val listModel = MutableLiveData() - - fun obtainSubordinate(hasMine: String?, roleTips: String?) = launch({ - val response = RetrofitServiceManager.obtainSubordinate(hasMine, roleTips) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - listModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index 617eb81..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/TransferOrderViewModel.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.casic.app.smartwell.vm - -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager - -class TransferOrderViewModel : BaseViewModel() { - - fun transferWorkOrder(id: String, userId: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.transferWorkOrder(id, userId) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "转单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index dfd3660..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/UpdateVersionViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.VersionResultModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class UpdateVersionViewModel : BaseViewModel() { - - private val gson = Gson() - val resultModel = MutableLiveData() - - fun updateVersion() = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.updateVersion() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ).data - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 60c0f39..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/UserDetailViewModel.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.model.UserDetailModel -import com.casic.app.smartwell.utils.Constant -import com.casic.app.smartwell.utils.SaveKeyValues -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class UserDetailViewModel : BaseViewModel() { - - private val gson = Gson() - - //用户信息不用现取现用，布尔值标志用户token是否失效 - val flag = MutableLiveData() - - fun obtainUserDetail() = launch({ - val response = RetrofitServiceManager.obtainUserDetail() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - val userData = gson.fromJson( - response, object : TypeToken() {}.type - ).data - SaveKeyValues.putValue(Constant.USER_DETAIL_MODEL, gson.toJson(userData)) - flag.value = true - } else { - //如果此次获取不到用户信息，那么就清空之前的用户缓存，然后让用户重新登录 - SaveKeyValues.removeKey(Constant.USER_DETAIL_MODEL) - flag.value = false - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt new file mode 100644 index 0000000..259c777 --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt @@ -0,0 +1,96 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +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.extensions.toErrorMessage +import com.casic.app.smartwell.model.SubordinateModel +import com.casic.app.smartwell.model.UserDetailModel +import com.casic.app.smartwell.model.VersionResultModel +import com.casic.app.smartwell.utils.Constant +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.SaveKeyValues +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken + +class UserViewModel : BaseViewModel() { + + private val gson = Gson() + + //用户信息不用现取现用，布尔值标志用户token是否失效 + val flag = MutableLiveData() + val subordinateModel = MutableLiveData() + val versionResultModel = MutableLiveData() + + fun obtainUserDetail() = launch({ + val response = RetrofitServiceManager.obtainUserDetail() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + val userData = gson.fromJson( + response, object : TypeToken() {}.type + ).data + SaveKeyValues.putValue(Constant.USER_DETAIL_MODEL, gson.toJson(userData)) + flag.value = true + } else { + //如果此次获取不到用户信息，那么就清空之前的用户缓存，然后让用户重新登录 + SaveKeyValues.removeKey(Constant.USER_DETAIL_MODEL) + flag.value = false + } + }, { + it.printStackTrace() + }) + + /** + * 转单下一级人员 + * */ + fun obtainSubordinate(hasMine: String?, roleTips: String?) = launch({ + val response = RetrofitServiceManager.obtainSubordinate(hasMine, roleTips) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + subordinateModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show() + } + }, { + it.printStackTrace() + }) + + fun changePassword(oldPwd: String, newPwd: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.changePassword(oldPwd, newPwd) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "修改成功，请重新登录".show() + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun updateVersion() = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.updateVersion() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + versionResultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ).data + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + 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 deleted file mode 100644 index 3e573eb..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellCountViewModel.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import org.json.JSONObject - -class WellCountViewModel : BaseViewModel() { - - val resultModel = MutableLiveData>() - - fun countWellByState() = launch({ - val response = RetrofitServiceManager.countWellByState() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - val map = HashMap(3) - - val jsonObject = JSONObject(response) - val data = jsonObject.getJSONObject("data") - map["bfWell"] = data.getString("bfWell") - map["cfWell"] = data.getString("cfWell") - map["total"] = data.getString("total") - resultModel.value = map - } else { - response.toErrorMessage().show() - } - }, { - 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 deleted file mode 100644 index 6810546..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellDetailViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.WellDetailModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class WellDetailViewModel : BaseViewModel() { - - private val gson = Gson() - val detailModel = MutableLiveData() - - fun obtainWellDetail(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainWellDetail(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index 7e754b7..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellMonitorViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.WellMonitorModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class WellMonitorViewModel : BaseViewModel() { - - private val gson = Gson() - val monitorModel = MutableLiveData() - - fun obtainMonitorResult(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainMonitorResult(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - monitorModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index cdac14c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellOperationViewModel.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.CommonResultModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class WellOperationViewModel : BaseViewModel() { - - private val gson = Gson() - val resultModel = MutableLiveData() - - fun obtainOperationResult(id: String, state: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainOperationResult(id, state) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "操作成功".show() - resultModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 deleted file mode 100644 index c5c73e9..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellTypeViewModel.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.WellTypeModel -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class WellTypeViewModel : BaseViewModel() { - - private val gson = Gson() - val wellTypeModel = MutableLiveData() - - fun obtainWellType() = launch({ - val response = RetrofitServiceManager.obtainWellType() - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - wellTypeModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt new file mode 100644 index 0000000..90f754a --- /dev/null +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt @@ -0,0 +1,115 @@ +package com.casic.app.smartwell.vm + +import androidx.lifecycle.MutableLiveData +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.extensions.toErrorMessage +import com.casic.app.smartwell.model.CommonResultModel +import com.casic.app.smartwell.model.WellDetailModel +import com.casic.app.smartwell.model.WellMonitorModel +import com.casic.app.smartwell.model.WellTypeModel +import com.casic.app.smartwell.utils.LoadState +import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import org.json.JSONObject + +class WellViewModel : BaseViewModel() { + + private val gson = Gson() + val countResultModel = MutableLiveData>() + val wellTypeModel = MutableLiveData() + val wellDetailModel = MutableLiveData() + val commonResultModel = MutableLiveData() + val monitorModel = MutableLiveData() + + fun countWellByState() = launch({ + val response = RetrofitServiceManager.countWellByState() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + val map = HashMap(3) + + val jsonObject = JSONObject(response) + val data = jsonObject.getJSONObject("data") + map["bfWell"] = data.getString("bfWell") + map["cfWell"] = data.getString("cfWell") + map["total"] = data.getString("total") + countResultModel.value = map + } else { + response.toErrorMessage().show() + } + }, { + it.printStackTrace() + }) + + fun obtainWellType() = launch({ + val response = RetrofitServiceManager.obtainWellType() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + wellTypeModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show() + } + }, { + it.printStackTrace() + }) + + fun obtainWellDetail(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.obtainWellDetail(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + wellDetailModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun obtainOperationResult(id: String, state: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.obtainOperationResult(id, state) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + "操作成功".show() + commonResultModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) + + fun obtainMonitorResult(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.obtainMonitorResult(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + monitorModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + 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 deleted file mode 100644 index b3f139c..0000000 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderDetailViewModel.kt +++ /dev/null @@ -1,37 +0,0 @@ -package com.casic.app.smartwell.vm - -import androidx.lifecycle.MutableLiveData -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.extensions.toErrorMessage -import com.casic.app.smartwell.model.WorkOrderDetailModel -import com.casic.app.smartwell.utils.LoadState -import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken - -class WorkOrderDetailViewModel : BaseViewModel() { - - private val gson = Gson() - val detailModel = MutableLiveData() - - fun obtainWorkOrderDetail(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainWorkOrderDetail(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - 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 ef8f37c..a2f60b1 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 @@ -6,12 +6,20 @@ import com.casic.app.smartwell.extensions.separateResponseCode import com.casic.app.smartwell.extensions.show import com.casic.app.smartwell.extensions.toErrorMessage +import com.casic.app.smartwell.model.OrderStatusModel +import com.casic.app.smartwell.model.WorkOrderDetailModel +import com.casic.app.smartwell.utils.LoadState import com.casic.app.smartwell.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken import org.json.JSONObject class WorkOrderViewModel : BaseViewModel() { + private val gson = Gson() val resultModel = MutableLiveData>() + val orderStatusModel = MutableLiveData() + val detailModel = MutableLiveData() fun countWorkOrderByState() = launch({ val response = RetrofitServiceManager.countWorkOrderByState() @@ -32,4 +40,36 @@ }, { it.printStackTrace() }) + + fun obtainOrderStatus() = launch({ + val response = RetrofitServiceManager.obtainOrderStatus() + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + orderStatusModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + response.toErrorMessage().show() + } + }, { + it.printStackTrace() + }) + + fun obtainWorkOrderDetail(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.obtainWorkOrderDetail(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + detailModel.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show() + } + }, { + loadState.value = LoadState.Fail + it.printStackTrace() + }) } \ No newline at end of file