diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f2aae19..321952e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -7,14 +7,17 @@ + + + + - @@ -71,5 +74,10 @@ + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f2aae19..321952e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -7,14 +7,17 @@ + + + + - @@ -71,5 +74,10 @@ + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt index 8b59d0d..4c941f0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt @@ -9,7 +9,7 @@ Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.FOREGROUND_SERVICE + Manifest.permission.READ_PHONE_STATE ) const val PERMISSIONS_CODE = 999 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f2aae19..321952e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -7,14 +7,17 @@ + + + + - @@ -71,5 +74,10 @@ + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt index 8b59d0d..4c941f0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt @@ -9,7 +9,7 @@ Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.FOREGROUND_SERVICE + Manifest.permission.READ_PHONE_STATE ) const val PERMISSIONS_CODE = 999 diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotProcessedDetailActivity.kt index e3859d2..4449dce 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -6,10 +6,8 @@ import com.amap.api.maps.model.Poi import com.casic.qd.smartwell.R import com.casic.qd.smartwell.base.BaseActivity -import com.casic.qd.smartwell.extensions.convertColor import com.casic.qd.smartwell.extensions.show import com.casic.qd.smartwell.extensions.showRouteOnMap -import com.casic.qd.smartwell.extensions.toChinese import com.casic.qd.smartwell.utils.Constant import com.casic.qd.smartwell.utils.DialogHelper import com.casic.qd.smartwell.utils.LoadState @@ -19,7 +17,6 @@ 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.* -import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* class OrderNotProcessedDetailActivity : BaseActivity() { @@ -27,7 +24,6 @@ private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var wellViewModel: WellViewModel private lateinit var operationViewModel: OperationViewModel - private lateinit var jobId: String override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -38,14 +34,15 @@ } override fun initData() { - jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + + workOrderViewModel.obtainWorkOrderDetail(jobId) } override fun initEvent() { - workOrderViewModel.obtainWorkOrderDetail(jobId) workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] @@ -54,14 +51,6 @@ orderCodeView.text = orderDetail.jobCode wellCodeView.text = orderDetail.wellCode devCodeView.text = orderDetail.devcode - val level = orderDetail.alarmLevel.toString() - if (level.isBlank()) { - alarmLevelView.text = "未知" - alarmLevelView.setTextColor(R.color.mainTextColor.convertColor()) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor()) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() wellLocationView.text = wellPosition @@ -80,30 +69,6 @@ } dispatchDateView.text = orderDetail.createTime - //接单 - acceptOrderButton.setOnClickListener { - AlertControlDialog.Builder() - .setContext(this) - .setTitle("操作提示") - .setMessage("确定要接单吗") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show() - return - } - operationViewModel.acceptOrder(orderDetail.jobId!!) - } - - override fun onCancelClick() { - - } - }).build().show() - } - //导航 navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() @@ -127,6 +92,30 @@ } } }) + + //接单 + acceptOrderButton.setOnClickListener { + AlertControlDialog.Builder() + .setContext(this) + .setTitle("操作提示") + .setMessage("确定要接单吗") + .setNegativeButton("取消") + .setPositiveButton("确定") + .setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + if (orderDetail.jobId.toString().isBlank()) { + "工单ID异常，无法接单".show() + return + } + operationViewModel.acceptOrder(orderDetail.jobId!!) + } + + override fun onCancelClick() { + + } + }).build().show() + } } }) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f2aae19..321952e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -7,14 +7,17 @@ + + + + - @@ -71,5 +74,10 @@ + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt b/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt index 8b59d0d..4c941f0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/Constant.kt @@ -9,7 +9,7 @@ Manifest.permission.ACCESS_LOCATION_EXTRA_COMMANDS, Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.FOREGROUND_SERVICE + Manifest.permission.READ_PHONE_STATE ) const val PERMISSIONS_CODE = 999 diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotProcessedDetailActivity.kt index e3859d2..4449dce 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -6,10 +6,8 @@ import com.amap.api.maps.model.Poi import com.casic.qd.smartwell.R import com.casic.qd.smartwell.base.BaseActivity -import com.casic.qd.smartwell.extensions.convertColor import com.casic.qd.smartwell.extensions.show import com.casic.qd.smartwell.extensions.showRouteOnMap -import com.casic.qd.smartwell.extensions.toChinese import com.casic.qd.smartwell.utils.Constant import com.casic.qd.smartwell.utils.DialogHelper import com.casic.qd.smartwell.utils.LoadState @@ -19,7 +17,6 @@ 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.* -import kotlinx.android.synthetic.main.include_base_order_detail.* import kotlinx.android.synthetic.main.include_base_title.* class OrderNotProcessedDetailActivity : BaseActivity() { @@ -27,7 +24,6 @@ private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var wellViewModel: WellViewModel private lateinit var operationViewModel: OperationViewModel - private lateinit var jobId: String override fun initLayoutView(): Int = R.layout.activity_order_not_processed_detail @@ -38,14 +34,15 @@ } override fun initData() { - jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + + workOrderViewModel.obtainWorkOrderDetail(jobId) } override fun initEvent() { - workOrderViewModel.obtainWorkOrderDetail(jobId) workOrderViewModel.detailModel.observe(this, { if (it.code == 200) { val orderDetail = it.data!![0] @@ -54,14 +51,6 @@ orderCodeView.text = orderDetail.jobCode wellCodeView.text = orderDetail.wellCode devCodeView.text = orderDetail.devcode - val level = orderDetail.alarmLevel.toString() - if (level.isBlank()) { - alarmLevelView.text = "未知" - alarmLevelView.setTextColor(R.color.mainTextColor.convertColor()) - } else { - alarmLevelView.text = level.toChinese() - alarmLevelView.setTextColor(R.color.redTextColor.convertColor()) - } alarmValueView.text = orderDetail.alarmValue val wellPosition = orderDetail.position.toString() wellLocationView.text = wellPosition @@ -80,30 +69,6 @@ } dispatchDateView.text = orderDetail.createTime - //接单 - acceptOrderButton.setOnClickListener { - AlertControlDialog.Builder() - .setContext(this) - .setTitle("操作提示") - .setMessage("确定要接单吗") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - if (orderDetail.jobId.toString().isBlank()) { - "工单ID异常，无法接单".show() - return - } - operationViewModel.acceptOrder(orderDetail.jobId!!) - } - - override fun onCancelClick() { - - } - }).build().show() - } - //导航 navigationButton.setOnClickListener { val wellId = orderDetail.wellId.toString() @@ -127,6 +92,30 @@ } } }) + + //接单 + acceptOrderButton.setOnClickListener { + AlertControlDialog.Builder() + .setContext(this) + .setTitle("操作提示") + .setMessage("确定要接单吗") + .setNegativeButton("取消") + .setPositiveButton("确定") + .setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + if (orderDetail.jobId.toString().isBlank()) { + "工单ID异常，无法接单".show() + return + } + operationViewModel.acceptOrder(orderDetail.jobId!!) + } + + override fun onCancelClick() { + + } + }).build().show() + } } }) diff --git a/app/src/main/res/layout/activity_order_not_processed_detail.xml b/app/src/main/res/layout/activity_order_not_processed_detail.xml index 9adbf82..94716ff 100644 --- a/app/src/main/res/layout/activity_order_not_processed_detail.xml +++ b/app/src/main/res/layout/activity_order_not_processed_detail.xml @@ -20,7 +20,152 @@ android:orientation="vertical" android:padding="@dimen/dp_10"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +